Skip to content

Commit 377ff7d

Browse files
committed
Convert SocketException to guzzle ConnectException
1 parent b9407c5 commit 377ff7d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/GuzzleHandlerAdapter.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Amp\Http\Client\Psr7\PsrHttpClientException;
1818
use Amp\Http\Client\Request as AmpRequest;
1919
use Amp\Http\Client\Response;
20+
use Amp\Http\Client\SocketException;
2021
use Amp\Http\Tunnel\Http1TunnelConnector;
2122
use Amp\Http\Tunnel\Https1TunnelConnector;
2223
use Amp\Socket\Certificate;
@@ -25,6 +26,7 @@
2526
use Amp\Socket\SocketConnector;
2627
use Amp\Socket\Socks5SocketConnector;
2728
use AssertionError;
29+
use GuzzleHttp\Exception\ConnectException;
2830
use GuzzleHttp\Promise\Promise;
2931
use GuzzleHttp\Promise\PromiseInterface;
3032
use GuzzleHttp\Psr7\Request as GuzzleRequest;
@@ -121,7 +123,7 @@ public function __invoke(PsrRequest $request, array $options): PromiseInterface
121123

122124
/** @psalm-suppress UndefinedVariable Using $promise reference in definition expression. */
123125
$promise = new Promise(
124-
function () use (&$promise, $future, $cancellation, $deferredCancellation): void {
126+
function () use (&$promise, $future, $cancellation, $deferredCancellation, $request): void {
125127
if ($deferredCancellation->isCancelled()) {
126128
return;
127129
}
@@ -138,6 +140,8 @@ function () use (&$promise, $future, $cancellation, $deferredCancellation): void
138140
if (!$cancellation->isRequested()) {
139141
$promise->reject($e);
140142
}
143+
} catch (SocketException $e) {
144+
$promise->reject(new ConnectException($e->getMessage(), $request, $e));
141145
} catch (\Throwable $e) {
142146
$promise->reject($e);
143147
}

0 commit comments

Comments
 (0)