daemon: Introduce parent_waits flag for daemonize().

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 0cfac60722d825fddb4714dfba651eb8265e770a..7f020c8f73f34674a0ff644aa84e73a9096962b1 100644 (file)
--- a/server.c
+++ b/server.c
@@ -491,10 +491,9 @@ static void server_init(int argc, char **argv)
        gettimeofday(now, NULL);
        set_server_start_time(now);
        init_user_list(user_list_file);
-       init_server_command_task(argc, argv);
        /* become daemon */
        if (conf.daemon_given)
-               daemonize();
+               daemonize(true /* parent waits for SIGTERM */);
        PARA_NOTICE_LOG("initializing audio format handlers\n");
        afh_init();
 
@@ -519,6 +518,9 @@ static void server_init(int argc, char **argv)
        para_unblock_signal(SIGCHLD);
        PARA_NOTICE_LOG("initializing virtual streaming system\n");
        init_vss_task(afs_socket);
+       init_server_command_task(argc, argv);
+       if (conf.daemon_given)
+               kill(getppid(), SIGTERM);
        PARA_NOTICE_LOG("server init complete\n");
 }