X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMrtg.pm;h=3ed8fd8147133808a7cee2ebca1a430bcf8ffa9d;hb=3bbdbaf825f28e2ee9a39b1773294203f899f8c7;hp=e2d7c0222dfde2e9bf898d92d68afc25dc4224db;hpb=56522a4722b4cbc073b0c5645e109164f9a5a995;p=spider.git diff --git a/perl/Mrtg.pm b/perl/Mrtg.pm index e2d7c022..3ed8fd81 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; @@ -42,6 +36,7 @@ Htmldir: $self->{html} Imagedir: $self->{html} Logdir: $self->{dir} Options[_]: growright +Timezone[_]: GMT ## ## EOF @@ -53,13 +48,15 @@ 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 { my ($self, $name, $vali, $valo, $title) = @_; my $uptime = main::uptime(); + $vali ||= 0; + $valo ||= 0; if (my $m = new IO::File ">$self->{dir}/$name" ) { $m->print("$vali\n$valo\n$uptime\n$title\n");