Changeset 638

Timestamp:

Sep 29, 2018 6:51:19 PM (6 years ago)

Author:

anonymous

Message:

Add cache auto expires timeout

File:

• trunk/lib/Cache.inc.php (modified) (4 diffs)

trunk/lib/Cache.inc.php

@@ -60 +60 @@
         // The minimum items to keep in the cache regardless of item or cache size.
         'min_items' => 5,
+
+        // How long in seconds before items in the cache are considered expired.
+        // When the cache expires, Cache->get() returns null.
+        'expires' => 3600,
     );
 
@@ -187 +191 @@
 
         // Save this value under the specified key.
-        $_SESSION['_cache'][$this->_ns][$key] =& $var;
+        $_SESSION['_cache'][$this->_ns][$key] = array(
+            'var' => $var,
+            'time' => time(),
+        );
 
         $app->logMsg(sprintf('Set cache item “%s”', $key), LOG_DEBUG, __FILE__, __LINE__);
@@ -217 +224 @@
 
         if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
-            $app->logMsg(sprintf('Retrieving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
-            // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
-            $tmp =& $_SESSION['_cache'][$this->_ns][$key];
-            unset($_SESSION['_cache'][$this->_ns][$key]);
-            $_SESSION['_cache'][$this->_ns][$key] =& $tmp;
-            // Return the unserialized datum.
-            return unserialize($_SESSION['_cache'][$this->_ns][$key]);
+            if (isset($_SESSION['_cache'][$this->_ns][$key]['time']) && $_SESSION['_cache'][$this->_ns][$key]['time'] > (time() - $this->getParam('expires'))) {
+                $app->logMsg(sprintf('Retrieving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
+                // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
+                $tmp =& $_SESSION['_cache'][$this->_ns][$key];
+                unset($_SESSION['_cache'][$this->_ns][$key]);
+                $_SESSION['_cache'][$this->_ns][$key] =& $tmp;
+                // Return the unserialized datum.
+                return unserialize($_SESSION['_cache'][$this->_ns][$key]['var']);
+            } else {
+                // Cached item has expired.
+                $app->logMsg(sprintf('Cached %s expired %s ago', $key, humanTime(time() - $_SESSION['_cache'][$this->_ns][$key]['time'])), LOG_DEBUG, __FILE__, __LINE__);
+                return null;
+            }
         } else {
             $app->logMsg(sprintf('Missing %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
@@ -245 +258 @@
         }
 
-        return (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns]));
+        if (isset($_SESSION['_cache'][$this->_ns])
+        && array_key_exists($key, $_SESSION['_cache'][$this->_ns])
+        && isset($_SESSION['_cache'][$this->_ns][$key]['time'])
+        && $_SESSION['_cache'][$this->_ns][$key]['time'] > (time() - $this->getParam('expires'))) {
+            $app->logMsg(sprintf('Cache item “%s” exists', $key), LOG_DEBUG, __FILE__, __LINE__);
+            return true;
+        } else {
+            $app->logMsg(sprintf('Cache item “%s” missing or expired', $key), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
     }