Skip to content

Commit dff5fbe

Browse files
authored
Merge pull request #257 from clue-labs/dns-multiple
Support falling back to multiple DNS servers from DNS config
2 parents 43c9f20 + c37c55c commit dff5fbe

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"require": {
2929
"php": ">=5.3.0",
3030
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
31-
"react/dns": "^1.1",
31+
"react/dns": "^1.7",
3232
"react/event-loop": "^1.0 || ^0.5",
3333
"react/promise": "^2.6.0 || ^1.2.1",
3434
"react/promise-timer": "^1.4.0",

src/Connector.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,18 @@ public function __construct(LoopInterface $loop, array $options = array())
5757
$resolver = $options['dns'];
5858
} else {
5959
if ($options['dns'] !== true) {
60-
$server = $options['dns'];
60+
$config = $options['dns'];
6161
} else {
6262
// try to load nameservers from system config or default to Google's public DNS
6363
$config = DnsConfig::loadSystemConfigBlocking();
64-
$server = $config->nameservers ? \reset($config->nameservers) : '8.8.8.8';
64+
if (!$config->nameservers) {
65+
$config->nameservers[] = '8.8.8.8'; // @codeCoverageIgnore
66+
}
6567
}
6668

6769
$factory = new DnsFactory();
6870
$resolver = $factory->createCached(
69-
$server,
71+
$config,
7072
$loop
7173
);
7274
}

0 commit comments

Comments
 (0)