diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-05-17 12:20:34 +0200 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-05-17 12:20:34 +0200 |
| commit | 57940dedcaab05f2dc392b2757cb3d58c59274c9 (patch) | |
| tree | 1783dc5a17cc20ddede409e13984576bff274302 /system/libraries/Cache/drivers | |
| parent | 5e50c42ef27261bc7fcb279499ce76cfc2519aa6 (diff) | |
| parent | 3a9eb39f61b10b3f86e50f4cd39ca0d9f010bac2 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/libraries/Cache/drivers')
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_redis.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php index a35fbf6d2..66966ba16 100644 --- a/system/libraries/Cache/drivers/Cache_redis.php +++ b/system/libraries/Cache/drivers/Cache_redis.php @@ -125,9 +125,7 @@ class CI_Cache_redis extends CI_Driver $this->_redis->sRemove('_ci_redis_serialized', $id); } - return ($ttl) - ? $this->_redis->setex($id, $ttl, $data) - : $this->_redis->set($id, $data); + return $this->_redis->set($id, $data, $ttl); } // ------------------------------------------------------------------------ @@ -223,7 +221,7 @@ class CI_Cache_redis extends CI_Driver { $value = $this->get($key); - if ($value) + if ($value !== FALSE) { return array( 'expire' => time() + $this->_redis->ttl($key), @@ -270,7 +268,7 @@ class CI_Cache_redis extends CI_Driver if ($CI->config->load('redis', TRUE, TRUE)) { - $config += $CI->config->item('redis'); + $config = $CI->config->item('redis'); } $config = array_merge(self::$_default_config, $config); @@ -302,7 +300,11 @@ class CI_Cache_redis extends CI_Driver if (isset($config['password'])) { - $this->_redis->auth($config['password']); + if ( ! $this->_redis->auth($config['password'])) + { + log_message('debug', 'Cache: Redis authentication failed.'); + return FALSE; + } } // Initialize the index of serialized values. |