StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

backend: support is_successful state for backups rather than deleting it when failing

Browse source 
This allows the UI to correctly show failed backups to the user and require them to manually delete those backups, rather than them mysteriously disappearing.

We can also hook into this later to send a notification to the user when the backup fails.
This commit is contained in:
Dane Everitt 2020-08-20 21:07:53 -07:00
parent 6066fa40f4
commit e3178ba6f0
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
7 changed files with 58 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php
View file

@ -17,7 +17,7 @@ class PruneOrphanedBackupsCommand extends Command
/**
* @var string
*/
protected $description = 'Removes all backups that have existed for more than "n" minutes which are not marked as completed.';
protected $description = 'Marks all backups that have not completed in the last "n" minutes as being failed.';
/**
* @param \Pterodactyl\Repositories\Eloquent\BackupRepository $repository
@ -25,7 +25,7 @@ class PruneOrphanedBackupsCommand extends Command
public function handle(BackupRepository $repository)
{
$since = $this->option('since-minutes');
if (!is_digit($since)) {
if (! is_digit($since)) {
throw new InvalidArgumentException('The --since-minutes option must be a valid numeric digit.');
}
@ -34,14 +34,18 @@ class PruneOrphanedBackupsCommand extends Command
->whereDate('created_at', '<=', CarbonImmutable::now()->subMinutes($since));
$count = $query->count();
if (!$count) {
$this->info('There are no orphaned backups to be removed.');
if (! $count) {
$this->info('There are no orphaned backups to be marked as failed.');
return;
}
$this->warn("Deleting {$count} backups that have not been marked as completed in the last {$since} minutes.");
$this->warn("Marking {$count} backups that have not been marked as completed in the last {$since} minutes as failed.");
$query->delete();
$query->update([
'is_successful' => false,
'completed_at' => CarbonImmutable::now(),
'updated_at' => CarbonImmutable::now(),
]);
}
}