Added option redundant_servers (#48)

php-cache · Aug 17, 2016 · e81e97a · e81e97a
1 parent 775dabc
commit e81e97a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/src/Factory/MemcacheFactory.php b/src/Factory/MemcacheFactory.php
@@ -32,6 +32,17 @@ public function getAdapter(array $config)
         $client = new Memcache();
         $client->connect($config['host'], $config['port']);
 
+        foreach ($config['redundant_servers'] as $server) {
+            if (!isset($server['host'])) {
+                continue;
+            }
+            $port = $config['port'];
+            if (isset($server['port'])) {
+                $port = $server['port'];
+            }
+            $client->addserver($server['host'], $port);
+        }
+
         return new MemcacheCachePool($client);
     }
 
@@ -41,11 +52,13 @@ public function getAdapter(array $config)
     protected static function configureOptionResolver(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-          'host' => '127.0.0.1',
-          'port' => 11211,
+          'host'              => '127.0.0.1',
+          'port'              => 11211,
+          'redundant_servers' => [],
         ]);
 
         $resolver->setAllowedTypes('host', ['string']);
         $resolver->setAllowedTypes('port', ['string', 'int']);
+        $resolver->setAllowedTypes('redundant_servers', ['array']);
     }
 }
diff --git a/src/Factory/MemcachedFactory.php b/src/Factory/MemcachedFactory.php
@@ -33,6 +33,17 @@ public function getAdapter(array $config)
         $client = new Memcached($config['persistent_id']);
         $client->addServer($config['host'], $config['port']);
 
+        foreach ($config['redundant_servers'] as $server) {
+            if (!isset($server['host'])) {
+                continue;
+            }
+            $port = $config['port'];
+            if (isset($server['port'])) {
+                $port = $server['port'];
+            }
+            $client->addServer($server['host'], $port);
+        }
+
         $pool = new MemcachedCachePool($client);
 
         if (null !== $config['pool_namespace']) {
@@ -48,15 +59,17 @@ public function getAdapter(array $config)
     protected static function configureOptionResolver(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'persistent_id'  => null,
-            'host'           => '127.0.0.1',
-            'port'           => 11211,
-            'pool_namespace' => null,
+            'persistent_id'     => null,
+            'host'              => '127.0.0.1',
+            'port'              => 11211,
+            'pool_namespace'    => null,
+            'redundant_servers' => [],
         ]);
 
         $resolver->setAllowedTypes('persistent_id', ['string', 'null']);
         $resolver->setAllowedTypes('host', ['string']);
         $resolver->setAllowedTypes('port', ['string', 'int']);
         $resolver->setAllowedTypes('pool_namespace', ['string', 'null']);
+        $resolver->setAllowedTypes('redundant_servers', ['array']);
     }
 }