Add option to regenerate graphs on script startup

diff --git a/upsgraph.pl b/upsgraph.pl
index 795ee95d9d87062e9593124aab8d4d26ed84e035..e291cc73abe6f7efd6f014346e2e790e4d72bf65 100755 (executable)
--- a/upsgraph.pl
+++ b/upsgraph.pl
@@ -23,6 +23,7 @@ $UPSGRAPH::stepsPerHour = (60 * 60) / $UPSGRAPH::step;
 $UPSGRAPH::keep = ($UPSGRAPH::daysCovered*24*60*60)/$UPSGRAPH::step;
 $UPSGRAPH::keepHours = ($UPSGRAPH::daysCovered*24*60*60)/$UPSGRAPH::stepsPerHour/$UPSGRAPH::step;
 $UPSGRAPH::hosts = ();
 $UPSGRAPH::keep = ($UPSGRAPH::daysCovered*24*60*60)/$UPSGRAPH::step;
 $UPSGRAPH::keepHours = ($UPSGRAPH::daysCovered*24*60*60)/$UPSGRAPH::stepsPerHour/$UPSGRAPH::step;
 $UPSGRAPH::hosts = ();

+$UPSGRAPH::regenerateOnStart = 1; #when set, regenerate graphs on script startup

 
 do $ARGV[0] or die "can't read config: $!";
 
 
 do $ARGV[0] or die "can't read config: $!";
 


@@ -428,6 +429,7 @@ foreach my $host (@$hosts) {
 #
 #exit 0 if ($child != 0);
 
 #
 #exit 0 if ($child != 0);
 

+my $first = $UPSGRAPH::regenerateOnStart;

 while(1) {
        open(HTML, ">${outdir}/index.html.new");
 
 while(1) {
        open(HTML, ">${outdir}/index.html.new");
 


@@ -504,7 +506,8 @@ while(1) {
                                };
                        }
 
                                };
                        }
 

-                       my @graphdef = ('-P', "--lazy", "-t", $hostname." - ".$vars->{$var}->{'name'});
+                       my @graphdef = ('-P', "-t", $hostname." - ".$vars->{$var}->{'name'});
+                       push @graphdef, "--lazy" if !$first;

 
                        push @graphdef, "DEF:${var}-avg=${rrdfile}.${var}:${var}:AVERAGE";
                        push @graphdef, "DEF:${var}-min=${rrdfile}.${var}:${var}:MIN";
 
                        push @graphdef, "DEF:${var}-avg=${rrdfile}.${var}:${var}:AVERAGE";
                        push @graphdef, "DEF:${var}-min=${rrdfile}.${var}:${var}:MIN";


@@ -629,4 +632,5 @@ while(1) {
        rename("${outdir}/index.html.new", "${outdir}/index.html");
 
        sleep(${step}/2);
        rename("${outdir}/index.html.new", "${outdir}/index.html");
 
        sleep(${step}/2);

+       $first = 0;

 }
 }