OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added support in RedisFactory to provide servers as a comma-separated string

Browse Source
This commit is contained in:
Alejandro Celaya 2019-08-07 17:01:09 +02:00
parent b0bb77ca81
commit 04389fc8b0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/Common/src/Cache/RedisFactory.php
View File

@ -6,9 +6,8 @@ namespace Shlinkio\Shlink\Common\Cache;
use Predis\Client as PredisClient; use Predis\Client as PredisClient;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
use function array_shift;
use function count; use function count;
use function is_array; use function explode;
use function is_string; use function is_string;
class RedisFactory class RedisFactory
@ -18,13 +17,11 @@ class RedisFactory
public function __invoke(ContainerInterface $container): PredisClient public function __invoke(ContainerInterface $container): PredisClient
{ {
$redisConfig = $container->get('config')['redis'] ?? []; $redisConfig = $container->get('config')['redis'] ?? [];
$servers = $redisConfig['servers'] ?? []; $servers = $redisConfig['servers'] ?? [];
$servers = is_string($servers) ? explode(',', $servers) : $servers;
$options = count($servers) <= 1 ? null : ['cluster' => 'redis'];
if (is_array($servers) && count($servers) === 1) {
$servers = array_shift($servers);
}
$options = is_string($servers) || count($servers) < 1 ? null : ['cluster' => 'redis'];
return new PredisClient($servers, $options); return new PredisClient($servers, $options);
} }
} }

3
module/Common/test/Cache/RedisFactoryTest.php
View File

@ -54,5 +54,8 @@ class RedisFactoryTest extends TestCase
yield 'empty cluster of servers' => [[ yield 'empty cluster of servers' => [[
'servers' => [], 'servers' => [],
], PredisCluster::class]; ], PredisCluster::class];
yield 'cluster of servers as string' => [[
'servers' => 'tcp://1.1.1.1:6379,tcp://2.2.2.2:6379',
], RedisCluster::class];
} }
} }