dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Andras Bacsai
2023-08-11 10:42:57 +02:00
parent c26407fa7e
commit 662b191dfd
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/DatabaseController.php
View File

@@ -26,7 +26,7 @@ class DatabaseController extends Controller
return view('project.database.configuration', ['database' => $database]);
}
public function backup_logs()
public function executions()
{
$backup_uuid = request()->route('backup_uuid');
$project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -45,8 +45,8 @@ class DatabaseController extends Controller
if (!$backup) {
return redirect()->route('dashboard');
}
$backup_executions = collect($backup->executions)->sortByDesc('created_at');
return view('project.database.backups.logs', ['database' => $database, 'backup' => $backup, 'backup_executions' => $backup_executions]);
$executions = collect($backup->executions)->sortByDesc('created_at');
return view('project.database.backups.executions', ['database' => $database, 'backup' => $backup, 'executions' => $executions]);
}
public function backups()

2
app/Http/Livewire/Project/Database/BackupExecutions.php
View File

@@ -12,6 +12,6 @@ class BackupExecutions extends Component
public function refreshBackupExecutions(): void
{
$this->executions = collect($this->backup->executions)->sortByDesc('created_at');
$this->executions = $this->backup->executions;
}
}

2
app/Jobs/DatabaseBackupJob.php
View File

@@ -105,7 +105,7 @@ class DatabaseBackupJob implements ShouldQueue
$this->backup_status = 'failed';
$this->add_to_backup_output($th->getMessage());
ray('Backup failed for ' . $this->database->uuid . ' at ' . $this->server->name . ':' . $this->backup_filename . '\n\nError:' . $th->getMessage());
$this->team->notify(new BackupFailed($this->backup, $this->database));
$this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
} finally {
$this->backup_log->update([
'status' => $this->backup_status,

4
app/Notifications/Database/BackupFailed.php
View File

@@ -17,9 +17,9 @@ class BackupFailed extends Notification implements ShouldQueue
public string $message = 'Backup FAILED';
public function __construct(ScheduledDatabaseBackup $backup, public $database)
public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output)
{
$this->message = "❌ Database backup for {$database->name} with frequency of $backup->frequency was FAILED.";
$this->message = "❌ Database backup for {$database->name} with frequency of $backup->frequency was FAILED.\n\nReason: $output";
}
public function via(object $notifiable): array