Merge remote-tracking branch 'tploch/2.0-memcache' into 2.0

cakephp · May 14, 2011 · 23d9e5d · 23d9e5d
2 parents a6f507d + 4aa9254
commit 23d9e5d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/app/config/core.php b/app/config/core.php
@@ -279,6 +279,7 @@
  * 		'servers' => array(
  * 			'127.0.0.1:11211' // localhost, default port 11211
  * 		), //[optional]
+ * 		'persistent' => true, // [optional] set this to false for non-persistent connections
  * 		'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
  *	));
  *

diff --git a/lib/Cake/Cache/Engine/MemcacheEngine.php b/lib/Cake/Cache/Engine/MemcacheEngine.php
@@ -64,6 +64,7 @@ public function init($settings = array()) {
 			'engine'=> 'Memcache',
 			'prefix' => Inflector::slug(APP_DIR) . '_',
 			'servers' => array('127.0.0.1'),
+			'persistent' => true,
 			'compress'=> false
 			), $settings)
 		);
@@ -79,7 +80,7 @@ public function init($settings = array()) {
 			$this->_Memcache = new Memcache();
 			foreach ($this->settings['servers'] as $server) {
 				list($host, $port) = $this->_parseServerString($server);
-				if ($this->_Memcache->addServer($host, $port)) {
+				if ($this->_Memcache->addServer($host, $port, $this->settings['persistent'])) {
 					$return = true;
 				}
 			}

diff --git a/lib/Cake/Console/templates/skel/config/core.php b/lib/Cake/Console/templates/skel/config/core.php
@@ -279,6 +279,7 @@
  * 		'servers' => array(
  * 			'127.0.0.1:11211' // localhost, default port 11211
  * 		), //[optional]
+ * 		'persistent' => true, // [optional] set this to false for non-persistent connections
  * 		'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
  *	));
  *

diff --git a/lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php b/lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php
@@ -50,7 +50,7 @@ class MemcacheEngineTest extends CakeTestCase {
  * @return void
  */
 	function setUp() {
-		$this->skipIf(!class_exists('Memcache'), '%s Apc is not installed or configured properly');
+		$this->skipIf(!class_exists('Memcache'), '%s Memcache is not installed or configured properly');
 		$this->_cacheDisable = Configure::read('Cache.disable');
 		Configure::write('Cache.disable', false);
 		Cache::config('memcache', array(
@@ -86,6 +86,7 @@ function testSettings() {
 			'duration'=> 3600,
 			'probability' => 100,
 			'servers' => array('127.0.0.1'),
+			'persistent' => true,
 			'compress' => false,
 			'engine' => 'Memcache'
 		);