summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobi Oetiker <tobi@oetiker.ch>2007-09-21 19:11:35 +0200
committerTobi Oetiker <tobi@oetiker.ch>2007-09-21 19:11:35 +0200
commit7b910a7d34a768f75e03ce357a0e8446e3237677 (patch)
treef2ab747db147f84a7a4c2cc10fd5142b7987b39d
parent306508c440ba0717e63b94511bf4ea3414def403 (diff)
downloadsmokeping-7b910a7d34a768f75e03ce357a0e8446e3237677.tar.gz
smokeping-7b910a7d34a768f75e03ce357a0e8446e3237677.tar.xz
force a config reread on reload_config
-rw-r--r--CHANGES4
-rw-r--r--lib/Smokeping.pm2
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 21c3b3c..d39436d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+* make sure reload_config reloads in any case even when the config has not changed ...
+ with this we solve the problem that maybe some @include configs have changed
+ which we would not find out otherwise -- tobi
+
* updated cropper: when selecting something outside the graph, multiply by 10. Use this to zoom out -- tobi
2007/9/16 -- released version 2.2.4
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 0324ae9..f870d05 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -4021,6 +4021,8 @@ sub reload_cfg ($) {
my $cfgfile = shift;
my ($oldcfg, $oldprobes) = ($cfg, $probes);
do_log("Reloading configuration.");
+ $cfg = undef;
+ $probes = undef;
eval { load_cfg($cfgfile) };
if ($@) {
do_log("Reloading configuration from $cfgfile failed: $@");