From b9da9ad92e6278e34316ec01a86f98bfd6a37055 Mon Sep 17 00:00:00 2001 From: "j.faassen" Date: Mon, 7 Jan 2019 14:38:15 +0100 Subject: [PATCH] Load server or cluster keys only when available Don't throw on missing server or cluster config (db config could be complete) --- src/Connector.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Connector.php b/src/Connector.php index 948b6f2..3569a34 100644 --- a/src/Connector.php +++ b/src/Connector.php @@ -48,18 +48,18 @@ public function getConfig($dsn) if ($config->getCluster()) { $clusterKeys = $backend->getKeys('clusters/' . $config->getCluster()); - if (!$clusterKeys) { - throw new RuntimeException("No configuration keys found for cluster: " . $config->getCluster()); + if ($clusterKeys) { + $this->loadKeys($config, $clusterKeys); } - $this->loadKeys($config, $clusterKeys); } if ($config->getServer()) { $serverKeys = $backend->getKeys('servers/' . $config->getServer()); - if (!$serverKeys) { - throw new RuntimeException("No configuration keys found for server: " . $config->getServer()); + if ($serverKeys) { + $this->loadKeys($config, $serverKeys); + } else { + $config->setAddress($config->getServer()); } - $this->loadKeys($config, $serverKeys); } return $config; }