Skip to content

Commit 361f668

Browse files
committed
[dsn] Cluster DSN
1 parent 43dfb36 commit 361f668

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Diff for: GenericStatsStorageFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function create($config): StatsStorage
2222
throw new \InvalidArgumentException('The config must have dsn key set.');
2323
}
2424

25-
$dsn = new Dsn($config['dsn']);
25+
$dsn = Dsn::parseFirst($config['dsn']);
2626

2727
if ($storageClass = $this->findStorageClass($dsn, Resources::getKnownStorages())) {
2828
return new $storageClass(1 === count($config) ? $config['dsn'] : $config);

Diff for: InfluxDbStorage.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private function getDb(): Database
182182

183183
private function parseDsn(string $dsn): array
184184
{
185-
$dsn = new Dsn($dsn);
185+
$dsn = Dsn::parseFirst($dsn);
186186

187187
if (false === in_array($dsn->getSchemeProtocol(), ['influxdb'], true)) {
188188
throw new \LogicException(sprintf(
@@ -196,10 +196,10 @@ private function parseDsn(string $dsn): array
196196
'port' => $dsn->getPort(),
197197
'user' => $dsn->getUser(),
198198
'password' => $dsn->getPassword(),
199-
'db' => $dsn->getQueryParameter('db'),
200-
'measurementSentMessages' => $dsn->getQueryParameter('measurementSentMessages'),
201-
'measurementConsumedMessages' => $dsn->getQueryParameter('measurementConsumedMessages'),
202-
'measurementConsumers' => $dsn->getQueryParameter('measurementConsumers'),
199+
'db' => $dsn->getString('db'),
200+
'measurementSentMessages' => $dsn->getString('measurementSentMessages'),
201+
'measurementConsumedMessages' => $dsn->getString('measurementConsumedMessages'),
202+
'measurementConsumers' => $dsn->getString('measurementConsumers'),
203203
]), function ($value) { return null !== $value; });
204204
}
205205
}

Diff for: WampStorage.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private function createClient(): Client
192192

193193
private function parseDsn(string $dsn): array
194194
{
195-
$dsn = new Dsn($dsn);
195+
$dsn = Dsn::parseFirst($dsn);
196196

197197
if (false === in_array($dsn->getSchemeProtocol(), ['wamp', 'ws'], true)) {
198198
throw new \LogicException(sprintf(
@@ -204,10 +204,10 @@ private function parseDsn(string $dsn): array
204204
return array_filter(array_replace($dsn->getQuery(), [
205205
'host' => $dsn->getHost(),
206206
'port' => $dsn->getPort(),
207-
'topic' => $dsn->getQueryParameter('topic'),
208-
'max_retries' => $dsn->getInt('max_retries'),
207+
'topic' => $dsn->getString('topic'),
208+
'max_retries' => $dsn->getDecimal('max_retries'),
209209
'initial_retry_delay' => $dsn->getFloat('initial_retry_delay'),
210-
'max_retry_delay' => $dsn->getInt('max_retry_delay'),
210+
'max_retry_delay' => $dsn->getDecimal('max_retry_delay'),
211211
'retry_delay_growth' => $dsn->getFloat('retry_delay_growth'),
212212
]), function ($value) { return null !== $value; });
213213
}

0 commit comments

Comments
 (0)