free(name_of_reference_snapshot);
name_of_reference_snapshot = NULL;
out:
- create_pid = 0;
create_process_stopped = 0;
return ret;
}
snapshot_creation_status = HS_PRE_SUCCESS;
ret = 1;
out:
- create_pid = 0;
return ret;
}
snapshot_creation_status);
return -E_BUG;
}
+ create_pid = 0;
}
if (pid == remove_pid) {
ret = handle_remove_exit(status);
return 1;
}
+/*
+ * Returns < 0 on errors, 0 if no config file is given and > 0 if the config
+ * file was read successfully.
+ */
static int parse_config_file(int override)
{
- int ret;
+ int ret, config_file_exists;
char *config_file;
struct stat statbuf;
char *old_logfile_arg = NULL;
old_daemon_given = conf.daemon_given;
}
- ret = stat(config_file, &statbuf);
- if (ret && conf.config_file_given) {
+ config_file_exists = !stat(config_file, &statbuf);
+ if (!config_file_exists && conf.config_file_given) {
ret = -ERRNO_TO_DSS_ERROR(errno);
DSS_ERROR_LOG("failed to stat config file %s\n", config_file);
goto out;
}
- if (!ret) {
+ if (config_file_exists) {
struct cmdline_parser_params params = {
.override = override,
.initialize = 0,
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);
if (ret < 0)
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();
}
ret = parse_config_file(0);
if (ret < 0)
goto out;
+ if (ret == 0) { /* no config file given */
+ /*
+ * Parse the command line options again, but this time check
+ * that all required options are given.
+ */
+ params = (struct cmdline_parser_params) {
+ .override = 1,
+ .initialize = 1,
+ .check_required = 1,
+ .check_ambiguity = 1,
+ .print_errors = 1
+ };
+ cmdline_parser_ext(argc, argv, &conf, ¶ms); /* aborts on errors */
+ }
if (conf.daemon_given)
daemon_init();
+ dump_dss_config("dss configuration");
ret = change_to_dest_dir();
if (ret < 0)
goto out;