Skip to content

Commit 086abb2

Browse files
committed
Actually delete the backup in the DB
1 parent 225ef29 commit 086abb2

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

app/Services/Backups/DeleteBackupService.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,20 @@ public function handle(Backup $backup)
8787
* Deletes a backup from an S3 disk.
8888
*
8989
* @param \Pterodactyl\Models\Backup $backup
90+
* @throws \Throwable
9091
*/
9192
protected function deleteFromS3(Backup $backup)
9293
{
93-
/** @var \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter */
94-
$adapter = $this->manager->adapter(Backup::ADAPTER_AWS_S3);
94+
$this->connection->transaction(function () use ($backup) {
95+
$this->repository->delete($backup->id);
9596

96-
$adapter->getClient()->deleteObject([
97-
'Bucket' => $adapter->getBucket(),
98-
'Key' => sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid),
99-
]);
97+
/** @var \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter */
98+
$adapter = $this->manager->adapter(Backup::ADAPTER_AWS_S3);
99+
100+
$adapter->getClient()->deleteObject([
101+
'Bucket' => $adapter->getBucket(),
102+
'Key' => sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid),
103+
]);
104+
});
100105
}
101106
}

0 commit comments

Comments
 (0)