Fix two typos in comments.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index a233c11f7060c0321502c35e555df78ef0b3931b..93ab802cb123bddde776042a9a9cff266102091c 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -734,7 +734,6 @@ static int handle_rsync_exit(int status)
        free(name_of_reference_snapshot);
        name_of_reference_snapshot = NULL;
 out:
-       create_pid = 0;
        create_process_stopped = 0;
        return ret;
 }
@@ -766,7 +765,6 @@ static int handle_pre_create_hook_exit(int status)
        snapshot_creation_status = HS_PRE_SUCCESS;
        ret = 1;
 out:
-       create_pid = 0;
        return ret;
 }
 
@@ -792,6 +790,7 @@ static int handle_sigchld(void)
                                snapshot_creation_status);
                        return -E_BUG;
                }
+               create_pid = 0;
        }
        if (pid == remove_pid) {
                ret = handle_remove_exit(status);
@@ -888,7 +887,6 @@ static int parse_config_file(int override)
                log_welcome(conf.loglevel_arg);
        }
        DSS_DEBUG_LOG("loglevel: %d\n", conf.loglevel_arg);
-//     cmdline_parser_dump(logfile? logfile : stdout, &conf);
        ret = config_file_exists;
 out:
        free(config_file);
@@ -903,14 +901,24 @@ static int change_to_dest_dir(void)
        return dss_chdir(conf.dest_dir_arg);
 }
 
+static void dump_dss_config(const char *msg)
+{
+       if (conf.loglevel_arg > INFO)
+               return;
+       DSS_INFO_LOG("%s\n", msg);
+       cmdline_parser_dump(logfile? logfile : stderr, &conf);
+}
+
 static int handle_sighup(void)
 {
        int ret;
 
-       DSS_NOTICE_LOG("SIGHUP\n");
+       DSS_NOTICE_LOG("SIGHUP, re-reading config\n");
+       dump_dss_config("current config");
        ret = parse_config_file(1);
        if (ret < 0)
                return ret;
+       dump_dss_config("new config");
        invalidate_next_snapshot_time();
        return change_to_dest_dir();
 }
@@ -1315,6 +1323,7 @@ int main(int argc, char **argv)
        }
        if (conf.daemon_given)
                daemon_init();
+       dump_dss_config("dss configuration");
        ret = change_to_dest_dir();
        if (ret < 0)
                goto out;