diff options
| author | Tobi Oetiker <tobi@oetiker.ch> | 2005-04-15 17:25:38 +0200 |
|---|---|---|
| committer | Tobi Oetiker <tobi@oetiker.ch> | 2005-04-15 17:25:38 +0200 |
| commit | e5123e033bdae8ceaf9ba847b929ec56d9dfa1e8 (patch) | |
| tree | 2ed8f663b46e950c10bcd7ef1637691dd57298f6 | |
| parent | 1f333688daf8f6dcf6f5a9c0be857dbcf0675dc3 (diff) | |
| download | smokeping-e5123e033bdae8ceaf9ba847b929ec56d9dfa1e8.tar.gz smokeping-e5123e033bdae8ceaf9ba847b929ec56d9dfa1e8.tar.xz | |
make navigator feature more robust for situations where invalid timeranges are provided.
| -rw-r--r-- | lib/Smokeping.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm index 518f5a1..16df63f 100644 --- a/lib/Smokeping.pm +++ b/lib/Smokeping.pm @@ -745,10 +745,10 @@ sub get_detail ($$$$){ "DEF:maxping=${rrd}:median:AVERAGE", 'PRINT:maxping:MAX:%le' ); my $ERROR = RRDs::error(); - do_log $ERROR if $ERROR; + return "<div>RRDtool did not understand your input: $ERROR.</div>" if $ERROR; my $val = $graphret->[0]; $val = 1 if $val =~ /nan/i; - $max = { $tasks[0][1] => $val }; + $max = { $tasks[0][1] => $val * 1.5 }; } my $smoke = $pings >= 3 @@ -808,8 +808,8 @@ sub get_detail ($$$$){ $end ||= 'last'; $start = exp2seconds($start) if $mode eq 's'; - my $startstr = POSIX::strftime("%Y-%m-%d %H:%M",localtime($mode eq 'n' ? $start : time-$start)); - my $endstr = POSIX::strftime("%Y-%m-%d %H:%M",localtime($mode eq 'n' ? $end : time)); + my $startstr = $start =~ /^\d+$/ ? POSIX::strftime("%Y-%m-%d %H:%M",localtime($mode eq 'n' ? $start : time-$start)) : $start; + my $endstr = $end =~ /^\d+$/ ? POSIX::strftime("%Y-%m-%d %H:%M",localtime($mode eq 'n' ? $end : time)) : $end; my $last = -1; my $swidth = $max->{$start} / $cfg->{Presentation}{detail}{height}; |