Skip to content

Commit d644758

Browse files
committed
Always return the status code from the daemon if possible
1 parent c2b1e7e commit d644758

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

app/Exceptions/Http/Connection/DaemonConnectionException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DaemonConnectionException extends DisplayException
2222
* @param \GuzzleHttp\Exception\GuzzleException $previous
2323
* @param bool $useStatusCode
2424
*/
25-
public function __construct(GuzzleException $previous, bool $useStatusCode = false)
25+
public function __construct(GuzzleException $previous, bool $useStatusCode = true)
2626
{
2727
/** @var \GuzzleHttp\Psr7\Response|null $response */
2828
$response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;

app/Http/Controllers/Api/Client/Servers/FileController.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
use Illuminate\Http\Response;
77
use Pterodactyl\Models\Server;
88
use Illuminate\Http\JsonResponse;
9-
use GuzzleHttp\Exception\TransferException;
109
use Pterodactyl\Services\Nodes\NodeJWTService;
1110
use Illuminate\Contracts\Routing\ResponseFactory;
1211
use Pterodactyl\Repositories\Wings\DaemonFileRepository;
1312
use Pterodactyl\Transformers\Daemon\FileObjectTransformer;
1413
use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
15-
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
1614
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CopyFileRequest;
1715
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ListFilesRequest;
1816
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DeleteFileRequest;
@@ -70,13 +68,9 @@ public function __construct(
7068
*/
7169
public function directory(ListFilesRequest $request, Server $server): array
7270
{
73-
try {
74-
$contents = $this->fileRepository
75-
->setServer($server)
76-
->getDirectory($request->get('directory') ?? '/');
77-
} catch (TransferException $exception) {
78-
throw new DaemonConnectionException($exception, true);
79-
}
71+
$contents = $this->fileRepository
72+
->setServer($server)
73+
->getDirectory($request->get('directory') ?? '/');
8074

8175
return $this->fractal->collection($contents)
8276
->transformWith($this->getTransformer(FileObjectTransformer::class))

app/Repositories/Wings/DaemonServerRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function getDetails(): array
2323
sprintf('/api/servers/%s', $this->server->uuid)
2424
);
2525
} catch (TransferException $exception) {
26-
throw new DaemonConnectionException($exception);
26+
throw new DaemonConnectionException($exception, false);
2727
}
2828

2929
return json_decode($response->getBody()->__toString(), true);

0 commit comments

Comments
 (0)