X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMrtg.pm;h=3871a9080cd7dfde330bbe8ac5f5dab0cd37636e;hb=fe84c3856588e9e80f888bf9a82845cacb609182;hp=e9ded9e623140ef575d1da22efd859ab2689891d;hpb=3f58f5ebe86a749d9e1ab37f25b3e7c7255a1906;p=spider.git diff --git a/perl/Mrtg.pm b/perl/Mrtg.pm index e9ded9e6..3871a908 100644 --- 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; @@ -53,7 +47,7 @@ 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 data @@ -72,7 +66,7 @@ sub data sub cfgprint { my ($self, $name, $options, $max, $title, $legend, $iname, $oname) = @_; - my $opt = join ', ', @$options, qw(withzeroes gauge growright nopercent integer); + my $opt = join ', ', @$options, qw(withzeroes growright nopercent integer); $self->{mc}->print(<<"EOF");