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

feat: scheduled task success and failure notifications

Browse Source
This commit is contained in:
peaklabs-dev
2024-12-10 14:45:47 +01:00
parent 96d4754a32
commit 99eea783ae
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/ScheduledTaskJob.php
View File

@@ -10,6 +10,7 @@ use App\Models\Server;
use App\Models\Service; use App\Models\Service;
use App\Models\Team; use App\Models\Team;
use App\Notifications\ScheduledTask\TaskFailed; use App\Notifications\ScheduledTask\TaskFailed;
use App\Notifications\ScheduledTask\TaskSuccess;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
@@ -111,6 +112,8 @@ class ScheduledTaskJob implements ShouldQueue
'message' => $this->task_output, 'message' => $this->task_output,
]); ]);
$this->team?->notify(new TaskSuccess($this->task, $this->task_output));
return; return;
} }
} }

2
app/Models/Application.php
View File

@@ -327,7 +327,7 @@ class Application extends BaseModel
return null; return null;
} }
public function failedTaskLink($task_uuid) public function taskLink($task_uuid)
{ {
if (data_get($this, 'environment.project.uuid')) { if (data_get($this, 'environment.project.uuid')) {
$route = route('project.application.scheduled-tasks', [ $route = route('project.application.scheduled-tasks', [

2
app/Models/Service.php
View File

@@ -1140,7 +1140,7 @@ class Service extends BaseModel
return null; return null;
} }
public function failedTaskLink($task_uuid) public function taskLink($task_uuid)
{ {
if (data_get($this, 'environment.project.uuid')) { if (data_get($this, 'environment.project.uuid')) {
$route = route('project.service.scheduled-tasks', [ $route = route('project.service.scheduled-tasks', [

4
app/Notifications/ScheduledTask/TaskFailed.php
View File

@@ -16,9 +16,9 @@ class TaskFailed extends CustomEmailNotification
{ {
$this->onQueue('high'); $this->onQueue('high');
if ($task->application) { if ($task->application) {
$this->url = $task->application->failedTaskLink($task->uuid); $this->url = $task->application->taskLink($task->uuid);
} elseif ($task->service) { } elseif ($task->service) {
$this->url = $task->service->failedTaskLink($task->uuid); $this->url = $task->service->taskLink($task->uuid);
} }
} }

10
app/Notifications/ScheduledTask/TaskSuccess.php
View File

@@ -8,7 +8,7 @@ use App\Notifications\Dto\DiscordMessage;
use App\Notifications\Dto\SlackMessage; use App\Notifications\Dto\SlackMessage;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
class TaskFailed extends CustomEmailNotification class TaskSuccess extends CustomEmailNotification
{ {
public ?string $url = null; public ?string $url = null;
@@ -16,9 +16,9 @@ class TaskFailed extends CustomEmailNotification
{ {
$this->onQueue('high'); $this->onQueue('high');
if ($task->application) { if ($task->application) {
$this->url = $task->application->failedTaskLink($task->uuid); $this->url = $task->application->taskLink($task->uuid);
} elseif ($task->service) { } elseif ($task->service) {
$this->url = $task->service->failedTaskLink($task->uuid); $this->url = $task->service->taskLink($task->uuid);
} }
} }
@@ -31,7 +31,7 @@ class TaskFailed extends CustomEmailNotification
{ {
$mail = new MailMessage; $mail = new MailMessage;
$mail->subject("Coolify: Scheduled task ({$this->task->name}) succeeded."); $mail->subject("Coolify: Scheduled task ({$this->task->name}) succeeded.");
$mail->view('emails.scheduled-task-failed', [ $mail->view('emails.scheduled-task-success', [
'task' => $this->task, 'task' => $this->task,
'url' => $this->url, 'url' => $this->url,
'output' => $this->output, 'output' => $this->output,
@@ -43,7 +43,7 @@ class TaskFailed extends CustomEmailNotification
public function toDiscord(): DiscordMessage public function toDiscord(): DiscordMessage
{ {
$message = new DiscordMessage( $message = new DiscordMessage(
title: ':check_mark: Scheduled task succeeded', title: ':white_check_mark: Scheduled task succeeded',
description: "Scheduled task ({$this->task->name}) succeeded.", description: "Scheduled task ({$this->task->name}) succeeded.",
color: DiscordMessage::successColor(), color: DiscordMessage::successColor(),
); );