Fix warning and ignored TTL in Redis cache driver.

siemova · web-flow · commit efe79129f617 · 2024-10-27T10:21:46.000-06:00
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
@@ -163,7 +163,7 @@ public function get($key)
 	{
 		$data = $this->_redis->hMGet($key, array('__ci_type', '__ci_value'));
 
-		if ($value !== FALSE && $this->_redis->sIsMember('_ci_redis_serialized', $key))
+		if ($data === FALSE || $this->_redis->sIsMember('_ci_redis_serialized', $key))
 		{
 			return FALSE;
 		}
@@ -223,6 +223,7 @@ public function save($id, $data, $ttl = 60, $raw = FALSE)
 		}
 		else
 		{
+			$this->_redis->expireAt($id, time() + $ttl);
 			$this->_redis->{static::$_sRemove_name}('_ci_redis_serialized', $id);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public function get($key)`
`163`	`163`	`{`
`164`	`164`	`$data = $this->_redis->hMGet($key, array('__ci_type', '__ci_value'));`
`165`	`165`
`166`		`- if ($value !== FALSE && $this->_redis->sIsMember('_ci_redis_serialized', $key))`
	`166`	`+ if ($data === FALSE \|\| $this->_redis->sIsMember('_ci_redis_serialized', $key))`
`167`	`167`	`{`
`168`	`168`	`return FALSE;`
`169`	`169`	`}`
`@@ -223,6 +223,7 @@ public function save($id, $data, $ttl = 60, $raw = FALSE)`
`223`	`223`	`}`
`224`	`224`	`else`
`225`	`225`	`{`
	`226`	`+ $this->_redis->expireAt($id, time() + $ttl);`
`226`	`227`	`$this->_redis->{static::$_sRemove_name}('_ci_redis_serialized', $id);`
`227`	`228`	`}`
`228`	`229`