Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cache_memcached: Improve #3620

Closed
wants to merge 1 commit into from
Closed

Cache_memcached: Improve #3620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 12 additions & 23 deletions system/libraries/Cache/drivers/Cache_memcached.php
View file
Open in desktop
Expand Up @@ -99,16 +99,14 @@ public function save($id, $data, $ttl = 60, $raw = FALSE)
$data = array($data, time(), $ttl);
}

if (get_class($this->_memcached) === 'Memcached')
if ($this->_memcache_conf['is_memcached'])
{
return $this->_memcached->set($id, $data, $ttl);
}
elseif (get_class($this->_memcached) === 'Memcache')
else
{
return $this->_memcached->set($id, $data, 0, $ttl);
}

return FALSE;
}

// ------------------------------------------------------------------------
Expand Down Expand Up @@ -209,7 +207,7 @@ public function get_metadata($id)
*
* @return bool
*/
protected function _setup_memcached()
protected function _setup_memcached($is_memcached)
{
// Try to load memcached server info from the config file.
$CI =& get_instance();
Expand All @@ -228,46 +226,37 @@ protected function _setup_memcached()
}
}

if (class_exists('Memcached', FALSE))
{
$this->_memcached = new Memcached();
}
elseif (class_exists('Memcache', FALSE))
{
$this->_memcached = new Memcache();
}
else
{
log_message('error', 'Failed to create object for Memcached Cache; extension not loaded?');
return FALSE;
}
$memcached = 'Memcache'.($is_memcached ? 'd' : '');
$this->_memcached = new $memcached();

foreach ($this->_memcache_conf as $cache_server)
{
isset($cache_server['hostname']) OR $cache_server['hostname'] = $defaults['host'];
isset($cache_server['port']) OR $cache_server['port'] = $defaults['port'];
isset($cache_server['weight']) OR $cache_server['weight'] = $defaults['weight'];

if (get_class($this->_memcached) === 'Memcache')
if ($is_memcached)
{
// Third parameter is persistance and defaults to TRUE.
$this->_memcached->addServer(
$cache_server['hostname'],
$cache_server['port'],
TRUE,
$cache_server['weight']
);
}
else
{
// Third parameter is persistance and defaults to TRUE.
$this->_memcached->addServer(
$cache_server['hostname'],
$cache_server['port'],
TRUE,
$cache_server['weight']
);
}
}

$this->_memcache_conf['is_memcached'] = $is_memcached;

return TRUE;
}

Expand All @@ -283,13 +272,13 @@ protected function _setup_memcached()
*/
public function is_supported()
{
if ( ! extension_loaded('memcached') && ! extension_loaded('memcache'))
if ( ! ($is_memcached = extension_loaded('memcached')) && ! extension_loaded('memcache'))
{
log_message('debug', 'The Memcached Extension must be loaded to use Memcached Cache.');
return FALSE;
}

return $this->_setup_memcached();
return $this->_setup_memcached($is_memcached);
}

}