sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't ever block storing node updates if wings returns an error; closes #2712

This commit is contained in:
Dane Everitt 2020-12-06 12:23:58 -08:00
parent 11054de5b3
commit 79673ca440
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Services/Nodes/NodeUpdateService.php
View File

@ -4,6 +4,7 @@ namespace Pterodactyl\Services\Nodes;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Pterodactyl\Models\Node; use Pterodactyl\Models\Node;
use Illuminate\Support\Facades\Log;
use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Exception\ConnectException;
use Illuminate\Database\ConnectionInterface; use Illuminate\Database\ConnectionInterface;
use Illuminate\Contracts\Encryption\Encrypter; use Illuminate\Contracts\Encryption\Encrypter;
@ -90,11 +91,17 @@ class NodeUpdateService
$this->configurationRepository->setNode($node)->update($updated); $this->configurationRepository->setNode($node)->update($updated);
} catch (DaemonConnectionException $exception) { } catch (DaemonConnectionException $exception) {
if (! is_null($exception->getPrevious()) && $exception->getPrevious() instanceof ConnectException) { Log::warning($exception, ['node_id' => $node->id]);
return [$updated, true];
}
throw $exception; // Never actually throw these exceptions up the stack. If we were able to change the settings
// but something went wrong with Wings we just want to store the update and let the user manually
// make changes as needed.
//
// This avoids issues with proxies such as CloudFlare which will see Wings as offline and then
// inject their own response pages, causing this logic to get fucked up.
//
// @see https://github.com/pterodactyl/panel/issues/2712
return [ $updated, true ];
} }
return [$updated, false]; return [$updated, false];