daemon: Introduce parent_waits flag for daemonize().

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 82f48e0..7f020c8 100644 (file)
--- a/server.c
+++ b/server.c
@@ -493,7 +493,7 @@ static void server_init(int argc, char **argv)
        init_user_list(user_list_file);
        /* become daemon */
        if (conf.daemon_given)
        init_user_list(user_list_file);
        /* become daemon */
        if (conf.daemon_given)

-               daemonize();
+               daemonize(true /* parent waits for SIGTERM */);

        PARA_NOTICE_LOG("initializing audio format handlers\n");
        afh_init();
 
        PARA_NOTICE_LOG("initializing audio format handlers\n");
        afh_init();
 


@@ -519,6 +519,8 @@ static void server_init(int argc, char **argv)
        PARA_NOTICE_LOG("initializing virtual streaming system\n");
        init_vss_task(afs_socket);
        init_server_command_task(argc, argv);
        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");
 }
 
        PARA_NOTICE_LOG("server init complete\n");
 }