danog/dns
1
0
Fork 0
mirror of https://github.com/danog/dns.git synced 2024-12-02 09:27:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #60 from amphp/0.8.x-pending-gc

Browse Source 
Clear pending requests if there's no response after the timeout
This commit is contained in:
Niklas Keller 2017-07-12 18:03:14 +02:00 committed by GitHub
commit 70441dab20
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/DefaultResolver.php
View File

@ -159,13 +159,13 @@ REGEX;
throw new ResolutionException("CNAME or DNAME chain too long (possible recursion?)"); throw new ResolutionException("CNAME or DNAME chain too long (possible recursion?)");
} }
private function doRequest($uri, $name, $type) { private function doRequest($uri, $name, $type, $timeout) {
$server = $this->loadExistingServer($uri) ?: $this->loadNewServer($uri); $server = $this->loadExistingServer($uri) ?: $this->loadNewServer($uri);
$useTCP = substr($uri, 0, 6) == "tcp://"; $useTCP = substr($uri, 0, 6) == "tcp://";
if ($useTCP && isset($server->connect)) { if ($useTCP && isset($server->connect)) {
return \Amp\pipe($server->connect, function() use ($uri, $name, $type) { return \Amp\pipe($server->connect, function() use ($uri, $name, $type, $timeout) {
return $this->doRequest($uri, $name, $type); return $this->doRequest($uri, $name, $type, $timeout);
}); });
} }
@ -204,7 +204,18 @@ REGEX;
$promisor = new Deferred; $promisor = new Deferred;
$server->pendingRequests[$requestId] = true; $server->pendingRequests[$requestId] = true;
$this->pendingRequests[$requestId] = [$promisor, $name, $type, $uri]; $this->pendingRequests[$requestId] = [$promisor, $name, $type, $uri, $timeout];
$timeoutWatcher = \Amp\once(function () use ($server, $requestId, $name, $timeout) {
/** @var Deferred $deferred */
$deferred = $this->pendingRequests[$requestId][0];
unset($this->pendingRequests[$requestId], $server->pendingRequests[$requestId]);
$deferred->fail(new TimeoutException("No response from the server for {$name} within {$timeout} milliseconds"));
}, $timeout);
$promisor->promise()->when(function () use ($timeoutWatcher) {
\Amp\cancel($timeoutWatcher);
});
return $promisor->promise(); return $promisor->promise();
} }
@ -267,7 +278,7 @@ REGEX;
$promises = []; $promises = [];
foreach ($types as $type) { foreach ($types as $type) {
$promises[] = $this->doRequest($uri, $name, $type); $promises[] = $this->doRequest($uri, $name, $type, $timeout);
} }
try { try {
@ -618,13 +629,13 @@ REGEX;
} }
private function processDecodedResponse($serverId, $requestId, $response) { private function processDecodedResponse($serverId, $requestId, $response) {
list($promisor, $name, $type, $uri) = $this->pendingRequests[$requestId]; list($promisor, $name, $type, $uri, $timeout) = $this->pendingRequests[$requestId];
// Retry via tcp if message has been truncated // Retry via tcp if message has been truncated
if ($response->isTruncated()) { if ($response->isTruncated()) {
if (\substr($uri, 0, 6) != "tcp://") { if (\substr($uri, 0, 6) != "tcp://") {
$uri = \preg_replace("#[a-z.]+://#", "tcp://", $uri); $uri = \preg_replace("#[a-z.]+://#", "tcp://", $uri);
$promisor->succeed($this->doRequest($uri, $name, $type)); $promisor->succeed($this->doRequest($uri, $name, $type, $timeout));
} else { } else {
$this->finalizeResult($serverId, $requestId, new ResolutionException( $this->finalizeResult($serverId, $requestId, new ResolutionException(
"Server returned truncated response" "Server returned truncated response"