only cache the last_update value for 10 seconds, so that we can reasonably use this...

[php-utility-classes.git] / include / classes / rrdstat.php-class

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 55d0c37a3ff1d310d18e5299b38948fec1f62298..ce334e0e6f0514f18ba5920e1a6b76d8db14a6df 100644 (file)
--- 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`;
 
@@ -476,11 +476,13 @@ class rrdstat {
 
   public function last_update() {
     // fetch time of last update in this RRD file
-    static $last_update;
+    static $last_update, $last_saved;
+    if (isset($last_update) && isset($last_saved) && ($last_saved <= (time() - 10))) { unset($last_update); }
     if (!isset($last_update) && in_array($this->status, array('ok','readonly'))) {
       $last_cmd = $this->rrdtool_bin.' last '.$this->rrd_file;
       $return = trim(`$last_cmd 2>&1`);
       $last_update = is_numeric($return)?$return:null;
+      $last_saved = time();
     }
   return isset($last_update)?$last_update:null;
   }