Merge pull request #138 from dovg/pinba_memcached_update

Pinba memcached update

Author: dovg

core/Cache/PeclMemcached.class.php

@@ -193,21 +193,8 @@ protected function ensureTriedToConnect()
 				return $this;
 
 			$this->triedConnect = true;
-			$this->instance = new Memcache();
 
-			try {
-				
-				try {
-					$this->instance->pconnect($this->host, $this->port, $this->connectTimeout);
-				} catch (BaseException $e) {
-					$this->instance->connect($this->host, $this->port, $this->connectTimeout);
-				}
-				
-				$this->alive = true;
-				
-			} catch (BaseException $e) {
-				// bad luck.
-			}
+			$this->connect();
 
 			return $this;
 		}
@@ -235,4 +222,23 @@ protected function store(
 			Assert::isUnreachable();
 		}
 
+		protected function connect()
+		{
+			$this->instance = new Memcache();
+			
+			try {
+				
+				try {
+					$this->instance->pconnect($this->host, $this->port, $this->connectTimeout);
+				} catch (BaseException $e) {
+					$this->instance->connect($this->host, $this->port, $this->connectTimeout);
+				}
+				
+				$this->alive = true;
+				
+			} catch (BaseException $e) {
+				// bad luck.
+			}
+		}
 	}
+?>

main/Monitoring/PinbedPeclMemcached.class.php

@@ -29,29 +29,6 @@ public static function create(
 			return new self($host, $port);
 		}
 
-		public function __construct(
-			$host = Memcached::DEFAULT_HOST,
-			$port = Memcached::DEFAULT_PORT,
-			$connectTimeout = PeclMemcached::DEFAULT_TIMEOUT
-		)
-		{
-			$this->host = $host;
-			$this->port = $port;
-			
-			if (PinbaClient::isEnabled())
-				PinbaClient::me()->timerStart(
-					'pecl_memcached_'.$host.'_'.$port.'_connect',
-					array('pecl_memcached_connect' => $host.'_'.$port)
-				);
-			
-			parent::__construct($host, $port, $connectTimeout);
-			
-			if (PinbaClient::isEnabled())
-				PinbaClient::me()->timerStop(
-					'pecl_memcached_'.$host.'_'.$port.'_connect'
-				);
-		}
-		
 		public function append($key, $data)
 		{
 			$this->log(__METHOD__);
@@ -120,6 +97,22 @@ protected function store(
 
 		}
 
+		protected function connect()
+		{
+			if (PinbaClient::isEnabled())
+				PinbaClient::me()->timerStart(
+					'pecl_memcached_'.$this->host.'_'.$this->port.'_connect',
+					array('pecl_memcached_connect' => $this->host.'_'.$this->port)
+				);
+			
+			parent::connect();
+			
+			if (PinbaClient::isEnabled())
+				PinbaClient::me()->timerStop(
+					'pecl_memcached_'.$this->host.'_'.$this->port.'_connect'
+				);
+		}
+		
 		/*void */ private function log($methodName)
 		{
 			if (PinbaClient::isEnabled())