mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-08-18 11:15:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19433 from marcusmoore/fixes/backup-restore-error

Browse Source 
Backup: Accounted for prefix during pre-restore backup
This commit is contained in:
snipe
2026-08-06 15:14:50 +01:00
committed by GitHub
parent 7481817e47 bf28db8c45
commit ca259779e3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/SettingsController.php
View File

@ -1107,15 +1107,18 @@ class SettingsController extends Controller
// Take a fresh pre-restore backup so we can point the operator at
// it if the restore fails after we wipe. This is the mitigation
// the pre-existing
$preRestoreBackupName = 'pre-restore-'.date('Y-m-d-H-i-s').'.zip';
Log::debug('Running pre-restore backup: '.$preRestoreBackupName);
$requestedBackupFilename = 'pre-restore-'.date('Y-m-d-H-i-s').'.zip';
// spatie prepends filename_prefix to the filename provided so this is the actual name on disk:
$preRestoreBackupFilename = config('backup.backup.destination.filename_prefix').$requestedBackupFilename;
$preBackupPath = storage_path($path).'/'.$preRestoreBackupFilename;
Log::debug('Running pre-restore backup: '.$preRestoreBackupFilename);
$preBackupExit = Artisan::call('snipeit:backup', [
'--filename' => $preRestoreBackupName,
'--filename' => $requestedBackupFilename,
'--force' => true,
]);
$preBackupPath = storage_path($path).'/'.$preRestoreBackupName;
if ($preBackupExit !== 0 || ! Storage::exists($path.'/'.$preRestoreBackupName)) {
if ($preBackupExit !== 0 || ! (Storage::exists($path.'/'.$preRestoreBackupFilename))) {
Log::warning('Pre-restore backup failed (exit '.$preBackupExit.'); aborting restore to protect existing data.');
return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.restore.pre_backup_failed'));
@ -1158,7 +1161,7 @@ class SettingsController extends Controller
Log::error('Restore failed after db:wipe. Pre-restore backup available at '.$preBackupPath);
return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.restore.failed_with_backup', [
'backup' => $preRestoreBackupName,
'backup' => $preRestoreBackupFilename,
]));
}
@ -1172,7 +1175,7 @@ class SettingsController extends Controller
Log::error('Migrate failed after restore. Pre-restore backup available at '.$preBackupPath);
return redirect()->route('settings.backups.index')->with('error', trans('admin/settings/message.restore.failed_with_backup', [
'backup' => $preRestoreBackupName,
'backup' => $preRestoreBackupFilename,
]));
}