add DXCIDR, fix version no tracking

[spider.git] / perl / Mrtg.pm

diff --git a/perl/Mrtg.pm b/perl/Mrtg.pm
index 8a6e79edce3f41a215531a842a8c19d07d4b0f3b..3ed8fd8147133808a7cee2ebca1a430bcf8ffa9d 100644 (file)
--- a/perl/Mrtg.pm
+++ b/perl/Mrtg.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) - 2002 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package Mrtg;
@@ -14,12 +14,6 @@ use DXDebug;
 use DXUtil;
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 sub new
 {
        my $pkg = shift;
@@ -42,6 +36,7 @@ Htmldir: $self->{html}
 Imagedir: $self->{html}
 Logdir: $self->{dir}
 Options[_]: growright
+Timezone[_]: GMT
 ##
 ##
 EOF
@@ -53,20 +48,29 @@ sub run
 {
        my $self = shift;
        $self->{mc}->close;
-       return `mrtg $self->{cfg}`;
+       return `mrtg --lock-file=$self->{dir}/mrtg.lock --confcache-file=$self->{dir}/mrtg.confcache $self->{cfg}`;
 }
 
-sub cfgprint
+sub data
 {
-       my ($self, $name, $vali, $valo, $options, $max, $title, $legend, $iname, $oname) = @_;
-       my $opt = join ', ', @$options, qw(withzeroes gauge growright nopercent integer);
+       my ($self, $name, $vali, $valo, $title) = @_;
        my $uptime = main::uptime();
+       $vali ||= 0;
+       $valo ||= 0;
 
-       if (my $m = new IO::File ">$self->{dir}/$name") {
+       if (my $m = new IO::File ">$self->{dir}/$name" ) {
                $m->print("$vali\n$valo\n$uptime\n$title\n");
                $m->close;
+       } else {
+               dbg("MRTG: cannot open $self->{dir}/$name $!");
        }
-               
+}
+
+sub cfgprint
+{
+       my ($self, $name, $options, $max, $title, $legend, $iname, $oname) = @_;
+       my $opt = join ', ', @$options, qw(withzeroes growright nopercent integer);
+
        $self->{mc}->print(<<"EOF");
 
 #