afs: Handle SIGHUP.

This required moving around some functions but was otherwise
straight forward.

diff --git a/afs.c b/afs.c
index 455bee7d62fe46a85d26adea1b1106b01e5ada85..de713fa7769502d1ee8d6929d34f1306f7adf1c7 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -497,16 +497,6 @@ static int setup_command_socket_or_die(void)
        return ret;
 }
 
        return ret;
 }
 

-static int server_socket;
-static struct command_task command_task_struct;
-static struct signal_task signal_task_struct;
-
-static void unregister_tasks(void)
-{
-       unregister_task(&command_task_struct.task);
-       unregister_task(&signal_task_struct.task);
-}
-

 static void close_afs_tables(enum osl_close_flags flags)
 {
        PARA_NOTICE_LOG("closing afs_tables\n");
 static void close_afs_tables(enum osl_close_flags flags)
 {
        PARA_NOTICE_LOG("closing afs_tables\n");


@@ -521,6 +511,86 @@ static void close_afs_tables(enum osl_close_flags flags)
        aft_shutdown(flags);
 }
 
        aft_shutdown(flags);
 }
 

+static char *database_dir;
+
+static int make_database_dir(void)
+{
+       int ret;
+
+       if (!database_dir) {
+               if (conf.afs_database_dir_given)
+                       database_dir = para_strdup(conf.afs_database_dir_arg);
+               else {
+                       char *home = para_homedir();
+                       database_dir = make_message(
+                               "%s/.paraslash/afs_database", home);
+                       free(home);
+               }
+       }
+       PARA_INFO_LOG("afs_database dir %s\n", database_dir);
+       ret = para_mkdir(database_dir, 0777);
+       if (ret >= 0 || ret == -E_EXIST)
+               return 1;
+       free(database_dir);
+       database_dir = NULL;
+       return ret;
+}
+
+
+static int open_afs_tables(void)
+{
+       int ret = make_database_dir();
+
+       if (ret < 0)
+               return ret;
+       ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
+       if (ret < 0)
+               return ret;
+       ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
+       if (ret < 0)
+               goto moods_init_error;
+       ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
+       if (ret < 0)
+               goto playlists_init_error;
+       ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
+       if (ret < 0)
+               goto lyrics_init_error;
+       ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
+       if (ret < 0)
+               goto images_init_error;
+       ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
+       if (ret < 0)
+               goto score_init_error;
+       ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
+       if (ret < 0)
+               goto aft_init_error;
+       return 1;
+
+aft_init_error:
+       score_shutdown(OSL_MARK_CLEAN);
+score_init_error:
+       images_shutdown(OSL_MARK_CLEAN);
+images_init_error:
+       lyrics_shutdown(OSL_MARK_CLEAN);
+lyrics_init_error:
+       playlists_shutdown(OSL_MARK_CLEAN);
+playlists_init_error:
+       moods_shutdown(OSL_MARK_CLEAN);
+moods_init_error:
+       attribute_shutdown(OSL_MARK_CLEAN);
+       return ret;
+}
+
+static int server_socket;
+static struct command_task command_task_struct;
+static struct signal_task signal_task_struct;
+
+static void unregister_tasks(void)
+{
+       unregister_task(&command_task_struct.task);
+       unregister_task(&signal_task_struct.task);
+}
+

 static void signal_pre_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = t->private_data;
 static void signal_pre_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = t->private_data;


@@ -538,6 +608,11 @@ static void signal_post_select(struct sched *s, struct task *t)
        t->ret = 1;
        if (st->signum == SIGUSR1)
                return; /* ignore SIGUSR1 */
        t->ret = 1;
        if (st->signum == SIGUSR1)
                return; /* ignore SIGUSR1 */

+       if (st->signum == SIGHUP) {
+               close_afs_tables(OSL_MARK_CLEAN);
+               t->ret = open_afs_tables();
+               return;
+       }

        PARA_NOTICE_LOG("caught signal %d\n", st->signum);
        t->ret = -E_SIGNAL_CAUGHT;
        unregister_tasks();
        PARA_NOTICE_LOG("caught signal %d\n", st->signum);
        t->ret = -E_SIGNAL_CAUGHT;
        unregister_tasks();


@@ -551,6 +626,7 @@ static void register_signal_task(void)
        para_install_sighandler(SIGINT);
        para_install_sighandler(SIGTERM);
        para_install_sighandler(SIGPIPE);
        para_install_sighandler(SIGINT);
        para_install_sighandler(SIGTERM);
        para_install_sighandler(SIGPIPE);

+       para_install_sighandler(SIGHUP);

 
        st->task.pre_select = signal_pre_select;
        st->task.post_select = signal_post_select;
 
        st->task.pre_select = signal_pre_select;
        st->task.post_select = signal_post_select;


@@ -723,75 +799,6 @@ void register_tasks(uint32_t cookie)
        register_command_task(cookie);
 }
 
        register_command_task(cookie);
 }
 

-static char *database_dir;
-
-static int make_database_dir(void)
-{
-       int ret;
-
-       if (!database_dir) {
-               if (conf.afs_database_dir_given)
-                       database_dir = para_strdup(conf.afs_database_dir_arg);
-               else {
-                       char *home = para_homedir();
-                       database_dir = make_message(
-                               "%s/.paraslash/afs_database", home);
-                       free(home);
-               }
-       }
-       PARA_INFO_LOG("afs_database dir %s\n", database_dir);
-       ret = para_mkdir(database_dir, 0777);
-       if (ret >= 0 || ret == -E_EXIST)
-               return 1;
-       free(database_dir);
-       database_dir = NULL;
-       return ret;
-}
-
-static int open_afs_tables(void)
-{
-       int ret = make_database_dir();
-
-       if (ret < 0)
-               return ret;
-       ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
-       if (ret < 0)
-               return ret;
-       ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
-       if (ret < 0)
-               goto moods_init_error;
-       ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
-       if (ret < 0)
-               goto playlists_init_error;
-       ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
-       if (ret < 0)
-               goto lyrics_init_error;
-       ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
-       if (ret < 0)
-               goto images_init_error;
-       ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
-       if (ret < 0)
-               goto score_init_error;
-       ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
-       if (ret < 0)
-               goto aft_init_error;
-       return 1;
-
-aft_init_error:
-       score_shutdown(OSL_MARK_CLEAN);
-score_init_error:
-       images_shutdown(OSL_MARK_CLEAN);
-images_init_error:
-       lyrics_shutdown(OSL_MARK_CLEAN);
-lyrics_init_error:
-       playlists_shutdown(OSL_MARK_CLEAN);
-playlists_init_error:
-       moods_shutdown(OSL_MARK_CLEAN);
-moods_init_error:
-       attribute_shutdown(OSL_MARK_CLEAN);
-       return ret;
-}
-

 __noreturn int afs_init(uint32_t cookie, int socket_fd)
 {
        enum play_mode current_play_mode;
 __noreturn int afs_init(uint32_t cookie, int socket_fd)
 {
        enum play_mode current_play_mode;

diff --git a/server.c b/server.c
index 334787241e3952b2462485fee68c7882f313e967..d5946e47386c03a40a802a1d407a69f7b0659fef 100644 (file)
--- a/server.c
+++ b/server.c
@@ -353,7 +353,7 @@ out:
 
 uint32_t afs_socket_cookie;
 static int afs_socket;
 
 uint32_t afs_socket_cookie;
 static int afs_socket;

-pid_t afs_pid;
+static pid_t afs_pid;

 
 static void init_afs(void)
 {
 
 static void init_afs(void)
 {


@@ -444,6 +444,8 @@ static void handle_sighup(void)
        mmd->selector_change = mmd->selector_num; /* do not change selector.. */
        change_selector(); /* .. just reload */
        init_user_list(user_list_file); /* reload user list */
        mmd->selector_change = mmd->selector_num; /* do not change selector.. */
        change_selector(); /* .. just reload */
        init_user_list(user_list_file); /* reload user list */

+       if (afs_pid)
+               kill(afs_pid, SIGHUP);

 }
 
 static void status_refresh(void)
 }
 
 static void status_refresh(void)