MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-26 12:36:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move signal handling to parent thread, add -V and -k options, closing #219, and fixing problems with daemontools

Browse Source
This commit is contained in:
Ron Pedde
2007-01-09 18:12:39 +00:00
parent 5f922b44d8
commit d2e5b45bd9
5 changed files with 162 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.c
View File

@@ -222,6 +222,7 @@ int main(int argc, char *argv[]) {
int old_song_count, song_count;
int force_non_root=0;
int skip_initial=1;
int kill_server=0;
int convert_conf=0;
char *db_type,*db_parms,*web_root,*runas, *tmp;
char **mp3_dir_array;
@@ -248,7 +249,7 @@ int main(int argc, char *argv[]) {
err_setlevel(2);
config.foreground=0;
while((option=getopt(argc,argv,"D:d:c:P:mfrysiuvab:")) != -1) {
while((option=getopt(argc,argv,"D:d:c:P:mfrysiuvab:Vk")) != -1) {
switch(option) {
case 'a':
appdir = 1;
@@ -315,6 +316,14 @@ int main(int argc, char *argv[]) {
convert_conf=1;
break;
case 'k':
kill_server=1;
break;
case 'V':
fprintf(stderr,"Firefly Media Server: Version %s\n",VERSION);
break;
default:
usage(argv[0]);
exit(EXIT_FAILURE);
@@ -329,6 +338,12 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE);
}
if(kill_server) {
os_signal_server(S_STOP);
exit(0);
}
/* read the configfile, if specified, otherwise
* try defaults */
config.stats.start_time=start_time=(int)time(NULL);
@@ -562,7 +577,7 @@ int main(int argc, char *argv[]) {
time(NULL)-start_time);
}
sleep(MAIN_SLEEP_INTERVAL);
os_wait(MAIN_SLEEP_INTERVAL);
rescan_counter += MAIN_SLEEP_INTERVAL;
}