diff options
| author | Niko Tyni <ntyni@iki.fi> | 2005-10-07 12:57:27 +0200 |
|---|---|---|
| committer | Niko Tyni <ntyni@iki.fi> | 2005-10-07 12:57:27 +0200 |
| commit | cd8d15446e258e68f143795d318b79c562e7de37 (patch) | |
| tree | aa0f3f8c270196913c25aa89ab4dc9566b914fc0 /lib/Smokeping.pm | |
| parent | 3fd3ab47081ef2df27c25203ed978e46156a204f (diff) | |
| download | smokeping-cd8d15446e258e68f143795d318b79c562e7de37.tar.gz smokeping-cd8d15446e258e68f143795d318b79c562e7de37.tar.xz | |
* (trunk,2.0)/
lib/Smokeping.pm,
lib/Smokeping/RRDtools.pm,
CHANGES
+ only warn if RRA parameters other than CF are different
config file and an RRD
Diffstat (limited to 'lib/Smokeping.pm')
| -rw-r--r-- | lib/Smokeping.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index c7aa8aa..486c6b4 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -412,9 +412,10 @@ sub init_target_tree ($$$$) { } } else { shift @create; # remove the filename - my $comparison = Smokeping::RRDtools::compare($name.".rrd", \@create); + my ($fatal, $comparison) = Smokeping::RRDtools::compare($name.".rrd", \@create); die("Error: RRD parameter mismatch ('$comparison'). You must delete $name.rrd or fix the configuration parameters.\n") - if $comparison; + if $fatal; + warn("Warning: RRD parameter mismatch('$comparison'). Continuing anyway.\n") if $comparison and not $fatal; Smokeping::RRDtools::tuneds($name.".rrd", \@create); } } |