From: Robert Kaiser Date: Sun, 26 Jun 2016 14:30:04 +0000 (+0200) Subject: make default fetch return the last entry and make sure we return C formatting; add... X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=commitdiff_plain;h=c797f39a6abd6294e222b01d9be5d53ef442462a;hp=cf2bc478bb9058a3b4e1f716c04dc3854728fb76 make default fetch return the last entry and make sure we return C formatting; add recording of last alert messages and message on recovers; add alerting of btrfs cleanup needs --- diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class index 55d0c37..aa7079d 100644 --- a/include/classes/rrdstat.php-class +++ b/include/classes/rrdstat.php-class @@ -440,11 +440,11 @@ class rrdstat { if (!is_numeric($end)) { $end = $this->last_update(); } elseif ($end < 0) { $end += $this->last_update(); } $end = intval($end/$resolution)*$resolution; - if (!is_numeric($start)) { $start = $end; } + if (!is_numeric($start)) { $start = $end-$resolution; } elseif ($start < 0) { $start += $end; } $start = intval($start/$resolution)*$resolution; - $fetch_cmd = $this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution + $fetch_cmd = 'LANG=C '.$this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution .' --start '.$start.' --end '.$end; $return = `$fetch_cmd 2>&1`;