summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorrofl0r <rofl0r@users.noreply.github.com>2020-09-16 17:04:05 +0100
committerrofl0r <rofl0r@users.noreply.github.com>2020-09-16 21:00:04 +0100
commitbad36cd9cd803f1bb6baaf96b76fac3f16f90161 (patch)
tree39492b1489189734f14a0348c8bac1ceb4d9b3d2
parent683a3541968681c3753954dd724db58b24a1db33 (diff)
move config reload message to reload_config()
move it to before disabling logging, so a message with the correct timestamp is printed if logging was already enabled. also add a message when loading finished, so one can see from the timestamp how long it took. note that this only works on a real config reload triggered by SIGHUP/SIGUSR1, because on startup we don't know yet where to log to.
-rw-r--r--src/conf.c2
-rw-r--r--src/main.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/conf.c b/src/conf.c
index 214475d..9c47032 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -493,8 +493,6 @@ int reload_config_file (const char *config_fname, struct config_s *conf)
{
int ret;
- log_message (LOG_NOTICE, "Reloading config file");
-
initialize_config_defaults (conf);
ret = load_config_file (config_fname, conf);
diff --git a/src/main.c b/src/main.c
index 5b2691a..98e024c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -257,6 +257,8 @@ int reload_config (int reload_logging)
int ret;
struct config_s *c_next = get_next_config();
+ log_message (LOG_NOTICE, "Reloading config file");
+
if (reload_logging) shutdown_logging ();
ret = reload_config_file (config_file, c_next);
@@ -269,6 +271,7 @@ int reload_config (int reload_logging)
config = c_next;
if (reload_logging) ret = setup_logging ();
+ log_message (LOG_NOTICE, "Reloading config file finished");
done:
return ret;