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

Don't load config multiple times concurrently

Browse Source
This commit is contained in:
Niklas Keller 2017-07-13 21:02:59 +02:00
parent ab2adecaea
commit 474787af05
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/BasicResolver.php
View File

@ -29,6 +29,9 @@ final class BasicResolver implements Resolver {
/** @var \Amp\Dns\Config|null */ /** @var \Amp\Dns\Config|null */
private $config; private $config;
/** @var Promise|null */
private $pendingConfig;
/** @var Cache */ /** @var Cache */
private $cache; private $cache;
@ -82,7 +85,7 @@ final class BasicResolver implements Resolver {
return call(function () use ($name, $typeRestriction) { return call(function () use ($name, $typeRestriction) {
if (!$this->config) { if (!$this->config) {
$this->config = yield $this->configLoader->loadConfig(); yield $this->reloadConfig();
} }
$inAddr = @\inet_pton($name); $inAddr = @\inet_pton($name);
@ -177,7 +180,7 @@ final class BasicResolver implements Resolver {
$promise = call(function () use ($name, $type) { $promise = call(function () use ($name, $type) {
if (!$this->config) { if (!$this->config) {
$this->config = yield $this->configLoader->loadConfig(); yield $this->reloadConfig();
} }
$name = $this->normalizeName($name, $type); $name = $this->normalizeName($name, $type);
@ -277,9 +280,19 @@ final class BasicResolver implements Resolver {
* @return Promise * @return Promise
*/ */
public function reloadConfig(): Promise { public function reloadConfig(): Promise {
return call(function () { if ($this->pendingConfig) {
return $this->pendingConfig;
}
$promise = call(function () {
$this->config = yield $this->configLoader->loadConfig(); $this->config = yield $this->configLoader->loadConfig();
}); });
$promise->onResolve(function () {
$this->pendingConfig = null;
});
return $promise;
} }
/** /**