summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Tyni <ntyni@iki.fi>2005-05-18 13:19:09 +0200
committerNiko Tyni <ntyni@iki.fi>2005-05-18 13:19:09 +0200
commitbf7247e98dfc9891a5adaaf60cbe392b25cb66ae (patch)
tree6ccefbd10f52929bd5c116547abd5a3cf2dd1253
parent6b119de859a72910df1b1bf83ab4e978af019694 (diff)
downloadsmokeping-bf7247e98dfc9891a5adaaf60cbe392b25cb66ae.tar.gz
smokeping-bf7247e98dfc9891a5adaaf60cbe392b25cb66ae.tar.xz
* branches/2.0/lib/Smokeping/RRDtools.pm,
branches/2.0/CHANGES: + RRDtool 1.2.x compatibility fix ("unknown RRD version: 0003" on restart) -- niko, reported by Sam Stickland <sam_ml *spacething.org>
-rw-r--r--CHANGES3
-rw-r--r--lib/Smokeping/RRDtools.pm3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index e572131..580ab3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+* RRDtool 1.2.x compatibility fix ("unknown RRD version: 0003" on restart)
+ -- niko, reported by Sam Stickland <sam_ml *spacething.org>
+
2005/05/11 - publish rc4 (tobi)
* Curl now has a new 'insecure_ssl' option for those not caring about CA paths
-- niko, original patch by Marc Spitzer <mspitzer *gmail.com>
diff --git a/lib/Smokeping/RRDtools.pm b/lib/Smokeping/RRDtools.pm
index 2b8e3a4..ac70837 100644
--- a/lib/Smokeping/RRDtools.pm
+++ b/lib/Smokeping/RRDtools.pm
@@ -97,7 +97,8 @@ sub info2create {
my $error = RRDs::error;
die("RRDs::info $file: ERROR: $error") if $error;
die("$file: unknown RRD version: $info->{rrd_version}")
- unless $info->{rrd_version} eq '0001';
+ unless $info->{rrd_version} eq '0001'
+ or $info->{rrd_version} eq '0003';
my $cf = $info->{"rra[0].cf"};
die("$file: no RRAs found?")
unless defined $cf;