From 97984991dc588710c3c03c0d41cbfc2ac7d67902 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 14 Nov 2016 15:29:28 -0800 Subject: [PATCH 1/2] Have to auth after connecting --- src/Factory/RedisFactory.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Factory/RedisFactory.php b/src/Factory/RedisFactory.php index e9a6c42..127cecd 100644 --- a/src/Factory/RedisFactory.php +++ b/src/Factory/RedisFactory.php @@ -39,16 +39,16 @@ public function getAdapter(array $config) throw new ConnectException(sprintf('Could not connect to Redis database on "%s:%s".', $config['host'], $config['port'])); } } else { + if (false === $client->connect($dsn->getFirstHost(), $dsn->getFirstPort())) { + throw new ConnectException(sprintf('Could not connect to Redis database on "%s:%s".', $dsn->getFirstHost(), $dsn->getFirstPort())); + } + if (!empty($dsn->getPassword())) { if (false === $client->auth($dsn->getPassword())) { throw new ConnectException('Could not connect authenticate connection to Redis database.'); } } - if (false === $client->connect($dsn->getFirstHost(), $dsn->getFirstPort())) { - throw new ConnectException(sprintf('Could not connect to Redis database on "%s:%s".', $dsn->getFirstHost(), $dsn->getFirstPort())); - } - if ($dsn->getDatabase() !== null) { if (false === $client->select($dsn->getDatabase())) { throw new ConnectException(sprintf('Could not select Redis database with index "%s".', $dsn->getDatabase())); From 920ab448729c8490f96c26a9bbbdf956fe4292a0 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 14 Nov 2016 15:30:52 -0800 Subject: [PATCH 2/2] Fixing styles --- src/Factory/RedisFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Factory/RedisFactory.php b/src/Factory/RedisFactory.php index 127cecd..68f61e6 100644 --- a/src/Factory/RedisFactory.php +++ b/src/Factory/RedisFactory.php @@ -42,7 +42,7 @@ public function getAdapter(array $config) if (false === $client->connect($dsn->getFirstHost(), $dsn->getFirstPort())) { throw new ConnectException(sprintf('Could not connect to Redis database on "%s:%s".', $dsn->getFirstHost(), $dsn->getFirstPort())); } - + if (!empty($dsn->getPassword())) { if (false === $client->auth($dsn->getPassword())) { throw new ConnectException('Could not connect authenticate connection to Redis database.');