X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.c;h=a895019a19bac91b7ca66d46a63373ead0123c97;hp=a50a3dedd9235274ae380ad6272279ba8ba6ada8;hb=404aae666e5f8d7ce511639cbe4727a7f2e690cc;hpb=41c5e79dcdd912777b7e235b6e9d238a066a21d0

diff --git a/dss.c b/dss.c
index a50a3de..a895019 100644
--- a/dss.c
+++ b/dss.c
@@ -5,12 +5,14 @@
  */
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <inttypes.h>
@@ -635,6 +637,7 @@ static int try_to_free_disk_space(void)
 	if (!low_disk_space)
 		goto out;
 	DSS_WARNING_LOG(("disk space low and nothing obvious to remove\n"));
+	why = "oldest";
 	victim = find_oldest_removable_snapshot(&sl);
 	if (victim)
 		goto remove;
@@ -977,7 +980,7 @@ static int check_config(void)
  * 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)
+static int parse_config_file(bool sighup)
 {
 	int ret, config_file_exists;
 	char *config_file = get_config_file_name();
@@ -985,7 +988,7 @@ static int parse_config_file(int override)
 	char *old_logfile_arg = NULL;
 	int old_daemon_given = 0;
 
-	if (override) { /* SIGHUP */
+	if (sighup) {
 		if (conf.logfile_given)
 			old_logfile_arg = dss_strdup(conf.logfile_arg);
 		old_daemon_given = conf.daemon_given;
@@ -999,12 +1002,12 @@ static int parse_config_file(int override)
 	}
 	if (config_file_exists) {
 		struct cmdline_parser_params params;
-		params.override = override;
+		params.override = sighup;
 		params.initialize = 0;
 		params.check_required = 1;
 		params.check_ambiguity = 0;
 		params.print_errors = 1;
-		if (override) { /* invalidate all rsync options */
+		if (sighup) { /* invalidate all rsync options */
 			int i;
 
 			for (i = 0; i < conf.rsync_option_given; i++) {
@@ -1018,7 +1021,7 @@ static int parse_config_file(int override)
 	ret = check_config();
 	if (ret < 0)
 		goto out;
-	if (override) {
+	if (sighup) {
 		/* don't change daemon mode on SIGHUP */
 		conf.daemon_given = old_daemon_given;
 		close_log(logfile);
@@ -1055,7 +1058,7 @@ static int handle_sighup(void)
 
 	DSS_NOTICE_LOG(("SIGHUP, re-reading config\n"));
 	dump_dss_config("old");
-	ret = parse_config_file(1);
+	ret = parse_config_file(true /* SIGHUP */);
 	if (ret < 0)
 		return ret;
 	dump_dss_config("reloaded");
@@ -1155,11 +1158,11 @@ static int rename_resume_snap(int64_t creation_time)
 	s = find_orphaned_snapshot(&sl);
 out:
 	if (s) {
-		DSS_INFO_LOG(("reusing %s snapshot %s\n", why, s->name));
+		DSS_NOTICE_LOG(("recycling %s snapshot %s\n", why, s->name));
 		ret = dss_rename(s->name, new_name);
 	}
 	if (ret >= 0)
-		DSS_NOTICE_LOG(("creating new snapshot %s\n", new_name));
+		DSS_NOTICE_LOG(("creating %s\n", new_name));
 	free(new_name);
 	free_snapshot_list(&sl);
 	return ret;
@@ -1506,6 +1509,7 @@ int main(int argc, char **argv)
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	ret = parse_config_file(0);
+	ret = parse_config_file(false /* no SIGHUP */);
 	if (ret < 0)
 		goto out;
 	if (ret == 0) { /* no config file given */
@@ -1513,7 +1517,6 @@ int main(int argc, char **argv)
 		 * Parse the command line options again, but this time check
 		 * that all required options are given.
 		 */
-		struct cmdline_parser_params params;
 		params.override = 1;
 		params.initialize = 1;
 		params.check_required = 1;