From c3f7fbc25efa73f99e0b664bf0b94e1bae99fb49 Mon Sep 17 00:00:00 2001 From: 7IN0SAN9 Date: Thu, 28 Jan 2016 17:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/cache/driver/Memcached.php | 21 +++++++++++++-------- library/think/session/driver/Memcached.php | 22 ++++++++++++++-------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/library/think/cache/driver/Memcached.php b/library/think/cache/driver/Memcached.php index db80c45e..ffc33180 100644 --- a/library/think/cache/driver/Memcached.php +++ b/library/think/cache/driver/Memcached.php @@ -18,19 +18,25 @@ namespace { class Memcached extends Memcache { const OPT_CONNECT_TIMEOUT = 14; - private $timeout = 1000; + private $timeout = 1000; public function addServers(array $servers = []) { - if(empty($servers)) return; + if (empty($servers)) { + return; + } + foreach ($servers as $key => $server) { - if (empty($server[0])) continue; + if (empty($server[0])) { + continue; + } + $this->addServer( - $server[0], + $server[0], !empty($server[1]) ? $server[1] : 11211, - true, + true, !empty($server[2]) ? $server[1] : 1, - $this->timeout > 0 ? ($this->timeout/1000) : 1 + $this->timeout > 0 ? ($this->timeout / 1000) : 1 ); } } @@ -56,7 +62,6 @@ namespace { namespace think\cache\driver { use think\Cache; - use think\Exception; class Memcached { @@ -175,4 +180,4 @@ namespace think\cache\driver { return $this->handler->flush(); } } -} \ No newline at end of file +} diff --git a/library/think/session/driver/Memcached.php b/library/think/session/driver/Memcached.php index dc922ac7..7d2445f7 100644 --- a/library/think/session/driver/Memcached.php +++ b/library/think/session/driver/Memcached.php @@ -8,6 +8,7 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- + namespace { // 检测php环境 if (!extension_loaded('memcached')) { @@ -17,19 +18,25 @@ namespace { class Memcached extends Memcache { const OPT_CONNECT_TIMEOUT = 14; - private $timeout = 1000; + private $timeout = 1000; public function addServers(array $servers = []) { - if(empty($servers)) return; + if (empty($servers)) { + return; + } + foreach ($servers as $key => $server) { - if (empty($server[0])) continue; + if (empty($server[0])) { + continue; + } + $this->addServer( - $server[0], + $server[0], !empty($server[1]) ? $server[1] : 11211, - true, + true, !empty($server[2]) ? $server[1] : 1, - $this->timeout > 0 ? ($this->timeout/1000) : 1 + $this->timeout > 0 ? ($this->timeout / 1000) : 1 ); } } @@ -55,7 +62,6 @@ namespace { namespace think\session\driver { use SessionHandler; - use think\Exception; class Memcached extends SessionHandler { @@ -154,4 +160,4 @@ namespace think\session\driver { return true; } } -} \ No newline at end of file +}