danog/dns-over-https
1
0
Fork 0
mirror of https://github.com/danog/dns-over-https.git synced 2024-11-26 11:54:44 +01:00
Code Issues Projects Releases Wiki Activity

Provide fallback config

Browse Source
This commit is contained in:
Daniil Gentili 2019-06-12 13:03:38 +02:00
parent 4b3b314337
commit 2e79953e46
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Rfc8484StubResolver.php
View File

@ -3,6 +3,7 @@
namespace Amp\DoH;
use Amp\Cache\Cache;
use Amp\Dns\Config;
use Amp\Dns\ConfigException;
use Amp\Dns\DnsException;
use Amp\Dns\NoRecordException;
@ -70,7 +71,11 @@ final class Rfc8484StubResolver implements Resolver
return call(function () use ($name, $typeRestriction) {
if (!$this->config) {
yield $this->reloadConfig();
try {
yield $this->reloadConfig();
} catch (ConfigException $e) {
$this->config = new Config([], []);
}
}
switch ($typeRestriction) {
@ -176,13 +181,12 @@ final class Rfc8484StubResolver implements Resolver
*/
public function reloadConfig(): Promise
{
$this->subResolver->reloadConfig();
if ($this->pendingConfig) {
return $this->pendingConfig;
}
$promise = call(function () {
yield $this->subResolver->reloadConfig();
$this->config = yield $this->configLoader->loadConfig();
});
@ -225,7 +229,11 @@ final class Rfc8484StubResolver implements Resolver
$promise = call(function () use ($name, $type) {
if (!$this->config) {
yield $this->reloadConfig();
try {
yield $this->reloadConfig();
} catch (ConfigException $e) {
$this->config = new Config([], []);
}
}
$name = $this->normalizeName($name, $type);