Added ability add non expiration data into cache.

lexa-m · lexa-m · commit 004910f7e6be · 2018-07-26T19:49:35.000+07:00
diff --git a/service/lib/cache.php b/service/lib/cache.php
@@ -51,6 +51,11 @@ class evxCache {
      */
     const LOCK_WAITING_REPEATS = 20;
 
+    /**
+     * Lifetime key value for keys without associated expire time
+     */
+    const NON_EXPIRATION_LIFETIME = -1;
+
     /**
      * Cache storage.
      *
@@ -173,7 +178,7 @@ public function delete($entryName) {
      * @param string  $entryName  Cache entry name
      * @param mixed   $data       Data to store
      */
-    public function save($entryName, $data){
+    public function save($entryName, $data, $nonExpiration = FALSE){
         $saveRes = false;
         $this->store($entryName, $data);
         switch($this->driver){
@@ -184,7 +189,9 @@ public function save($entryName, $data){
                     $lifetime = time() + $cacheLifetime;
                 }*/
                 $ttl = evxCache::DAY;
-                if(!$lifetime){
+                if($nonExpiration){
+                    $lifetime = evxCache::NON_EXPIRATION_LIFETIME;
+                }else if(!$lifetime){
                     // 1 day if cache lifetime is not set
                     $lifetime = time() + evxCache::DAY;
                 }else{
@@ -193,7 +200,11 @@ public function save($entryName, $data){
                 }
                 $aCachedData = array('lifetime' => $lifetime, 'data' => $data, 'lock' => true);
                 if('redis' == $this->driver){
-                    $saveRes = $this->oDriver->set($entryName, json_encode($aCachedData), 'ex', $ttl);
+                    if($nonExpiration){
+                        $saveRes = $this->oDriver->set($entryName, json_encode($aCachedData));
+                    }else{
+                        $saveRes = $this->oDriver->set($entryName, json_encode($aCachedData), 'ex', $ttl);
+                    }
                     $this->oDriver->getConnection()->switchToSlave();
                 }else{
                     $saveRes = $this->oDriver->set($entryName, $aCachedData);
@@ -292,7 +303,7 @@ public function loadCachedData($entryName, $default = NULL, $cacheLifetime = FAL
             $memcachedData = ('redis' == $this->driver) ? json_decode($this->oDriver->get($entryName), TRUE) : $this->oDriver->get($entryName);
             if($memcachedData && isset($memcachedData['lifetime']) && isset($memcachedData['data'])){
                 $result['data'] = $memcachedData['data'];
-                if($memcachedData['lifetime'] < time()){
+                if($memcachedData['lifetime'] > 0 && $memcachedData['lifetime'] < time()){
                     $result['expired'] = TRUE;
                 }
             }
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -2180,7 +2180,7 @@ public function getTokenFullHistoryGrouped($updateCache = FALSE){
                 );
                 if(is_array($dbData) && !empty($dbData['result'])){
                     $result = $dbData['result'];
-                    $this->oCache->save($cache, $result);
+                    $this->oCache->save($cache, $result, $cacheLifetime ? FALSE : TRUE);
                 }
             }
             if(is_array($result) && sizeof($result)){

Original file line number	Diff line number	Diff line change
`@@ -2180,7 +2180,7 @@ public function getTokenFullHistoryGrouped($updateCache = FALSE){`
`2180`	`2180`	`);`
`2181`	`2181`	`if(is_array($dbData) && !empty($dbData['result'])){`
`2182`	`2182`	`$result = $dbData['result'];`
`2183`		`- $this->oCache->save($cache, $result);`
	`2183`	`+ $this->oCache->save($cache, $result, $cacheLifetime ? FALSE : TRUE);`
`2184`	`2184`	`}`
`2185`	`2185`	`}`
`2186`	`2186`	`if(is_array($result) && sizeof($result)){`