Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't abort deleting a backup if the daemon cannot find it

Browse source
This commit is contained in:
Dane Everitt 2020-05-09 19:19:45 -07:00
parent 52966ede89
commit d4e037db9c
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Exceptions/Http/Connection/DaemonConnectionException.php
View file

@ -6,6 +6,9 @@ use Illuminate\Http\Response;
use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Exception\GuzzleException;
use Pterodactyl\Exceptions\DisplayException; use Pterodactyl\Exceptions\DisplayException;
/**
* @method \GuzzleHttp\Exception\GuzzleException getPrevious()
*/
class DaemonConnectionException extends DisplayException class DaemonConnectionException extends DisplayException
{ {
/** /**

14
app/Services/Backups/DeleteBackupService.php
View file

@ -2,10 +2,13 @@
namespace Pterodactyl\Services\Backups; namespace Pterodactyl\Services\Backups;
use Illuminate\Http\Response;
use Pterodactyl\Models\Backup; use Pterodactyl\Models\Backup;
use GuzzleHttp\Exception\ClientException;
use Illuminate\Database\ConnectionInterface; use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Repositories\Eloquent\BackupRepository; use Pterodactyl\Repositories\Eloquent\BackupRepository;
use Pterodactyl\Repositories\Wings\DaemonBackupRepository; use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class DeleteBackupService class DeleteBackupService
{ {
@ -50,7 +53,16 @@ class DeleteBackupService
public function handle(Backup $backup) public function handle(Backup $backup)
{ {
$this->connection->transaction(function () use ($backup) { $this->connection->transaction(function () use ($backup) {
$this->daemonBackupRepository->setServer($backup->server)->delete($backup); try {
$this->daemonBackupRepository->setServer($backup->server)->delete($backup);
} catch (DaemonConnectionException $exception) {
$previous = $exception->getPrevious();
// Don't fail the request if the Daemon responds with a 404, just assume the backup
// doesn't actually exist and remove it's reference from the Panel as well.
if (! $previous instanceof ClientException || $previous->getResponse()->getStatusCode() !== Response::HTTP_NOT_FOUND) {
throw $exception;
}
}
$this->repository->delete($backup->id); $this->repository->delete($backup->id);
}); });