fix: make sure important jobs/actions are running on high prio queue

2024-11-22 11:16:01 +01:00
parent ef629d5816
commit 7dc65dfd79
58 changed files with 167 additions and 75 deletions
--- a/app/Actions/Application/StopApplication.php
+++ b/app/Actions/Application/StopApplication.php
@@ -10,6 +10,8 @@ class StopApplication
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(Application $application, bool $previewDeployments = false, bool $dockerCleanup = true)
    {
        try {
--- a/app/Actions/CoolifyTask/PrepareCoolifyTask.php
+++ b/app/Actions/CoolifyTask/PrepareCoolifyTask.php
@@ -46,7 +46,7 @@ class PrepareCoolifyTask
            call_event_on_finish: $this->remoteProcessArgs->call_event_on_finish,
            call_event_data: $this->remoteProcessArgs->call_event_data,
        );
-        dispatch($job)->onQueue('high');
+        dispatch($job);
        $this->activity->refresh();

        return $this->activity;
--- a/app/Actions/Database/StartDatabase.php
+++ b/app/Actions/Database/StartDatabase.php
@@ -16,6 +16,8 @@ class StartDatabase
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse $database)
    {
        $server = $database->destination->server;
@@ -49,7 +51,7 @@ class StartDatabase
                break;
        }
        if ($database->is_public && $database->public_port) {
-            StartDatabaseProxy::dispatch($database)->onQueue('high');
+            StartDatabaseProxy::dispatch($database);
        }

        return $activity;
--- a/app/Actions/Database/StartDatabaseProxy.php
+++ b/app/Actions/Database/StartDatabaseProxy.php
@@ -18,6 +18,8 @@ class StartDatabaseProxy
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse|ServiceDatabase $database)
    {
        $internalPort = null;
--- a/app/Actions/Database/StopDatabaseProxy.php
+++ b/app/Actions/Database/StopDatabaseProxy.php
@@ -18,6 +18,8 @@ class StopDatabaseProxy
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|ServiceDatabase|StandaloneDragonfly|StandaloneClickhouse $database)
    {
        $server = data_get($database, 'destination.server');
--- a/app/Actions/Docker/GetContainersStatus.php
+++ b/app/Actions/Docker/GetContainersStatus.php
@@ -7,7 +7,6 @@ use App\Actions\Shared\ComplexStatusCheck;
 use App\Models\ApplicationPreview;
 use App\Models\Server;
 use App\Models\ServiceDatabase;
-use App\Notifications\Container\ContainerRestarted;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -16,6 +15,8 @@ class GetContainersStatus
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public $applications;

    public ?Collection $containers;
--- a/app/Actions/Server/CleanupDocker.php
+++ b/app/Actions/Server/CleanupDocker.php
@@ -9,6 +9,8 @@ class CleanupDocker
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(Server $server)
    {
        $settings = instanceSettings();
--- a/app/Actions/Server/ServerCheck.php
+++ b/app/Actions/Server/ServerCheck.php
@@ -130,10 +130,10 @@ class ServerCheck
        if ($foundLogDrainContainer) {
            $status = data_get($foundLogDrainContainer, 'State.Status');
            if ($status !== 'running') {
-                StartLogDrain::dispatch($this->server)->onQueue('high');
+                StartLogDrain::dispatch($this->server);
            }
        } else {
-            StartLogDrain::dispatch($this->server)->onQueue('high');
+            StartLogDrain::dispatch($this->server);
        }
    }

--- a/app/Actions/Server/StartLogDrain.php
+++ b/app/Actions/Server/StartLogDrain.php
@@ -9,6 +9,8 @@ class StartLogDrain
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(Server $server)
    {
        if ($server->settings->is_logdrain_newrelic_enabled) {
--- a/app/Actions/Server/UpdateCoolify.php
+++ b/app/Actions/Server/UpdateCoolify.php
@@ -29,7 +29,7 @@ class UpdateCoolify
        if (! $this->server) {
            return;
        }
-        CleanupDocker::dispatch($this->server)->onQueue('high');
+        CleanupDocker::dispatch($this->server);
        $this->latestVersion = get_latest_version_of_coolify();
        $this->currentVersion = config('version');
        if (! $manual_update) {
--- a/app/Actions/Server/ValidateServer.php
+++ b/app/Actions/Server/ValidateServer.php
@@ -9,6 +9,8 @@ class ValidateServer
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public ?string $uptime = null;

    public ?string $error = null;
--- a/app/Actions/Service/RestartService.php
+++ b/app/Actions/Service/RestartService.php
@@ -9,6 +9,8 @@ class RestartService
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(Service $service)
    {
        StopService::run($service);
--- a/app/Actions/Service/StartService.php
+++ b/app/Actions/Service/StartService.php
@@ -10,6 +10,8 @@ class StartService
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(Service $service)
    {
        $service->saveComposeConfigs();
--- a/app/Actions/Service/StopService.php
+++ b/app/Actions/Service/StopService.php
@@ -10,6 +10,8 @@ class StopService
 {
    use AsAction;

+    public string $jobQueue = 'high';
+
    public function handle(Service $service, bool $isDeleteOperation = false, bool $dockerCleanup = true)
    {
        try {
--- a/app/Console/Commands/ServicesDelete.php
+++ b/app/Console/Commands/ServicesDelete.php
@@ -96,7 +96,7 @@ class ServicesDelete extends Command
                if (! $confirmed) {
                    break;
                }
-                DeleteResourceJob::dispatch($toDelete)->onQueue('high');
+                DeleteResourceJob::dispatch($toDelete);
            }
        }
    }
@@ -122,7 +122,7 @@ class ServicesDelete extends Command
                if (! $confirmed) {
                    return;
                }
-                DeleteResourceJob::dispatch($toDelete)->onQueue('high');
+                DeleteResourceJob::dispatch($toDelete);
            }
        }
    }
@@ -148,7 +148,7 @@ class ServicesDelete extends Command
                if (! $confirmed) {
                    return;
                }
-                DeleteResourceJob::dispatch($toDelete)->onQueue('high');
+                DeleteResourceJob::dispatch($toDelete);
            }
        }
    }
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/app/Http/Controllers/Api/ApplicationsController.php
@@ -1224,7 +1224,7 @@ class ApplicationsController extends Controller
            $service->name = "service-$service->uuid";
            $service->parse(isNew: true);
            if ($instantDeploy) {
-                StartService::dispatch($service)->onQueue('high');
+                StartService::dispatch($service);
            }

            return response()->json(serializeApiResponse([
@@ -1379,7 +1379,7 @@ class ApplicationsController extends Controller
            deleteVolumes: $request->query->get('delete_volumes', true),
            dockerCleanup: $request->query->get('docker_cleanup', true),
            deleteConnectedNetworks: $request->query->get('delete_connected_networks', true)
-        )->onQueue('high');
+        );

        return response()->json([
            'message' => 'Application deletion request queued.',
@@ -2523,7 +2523,7 @@ class ApplicationsController extends Controller
        if (! $application) {
            return response()->json(['message' => 'Application not found.'], 404);
        }
-        StopApplication::dispatch($application)->onQueue('high');
+        StopApplication::dispatch($application);

        return response()->json(
            [
--- a/app/Http/Controllers/Api/DatabasesController.php
+++ b/app/Http/Controllers/Api/DatabasesController.php
@@ -497,9 +497,9 @@ class DatabasesController extends Controller
        $database->update($request->all());

        if ($whatToDoWithDatabaseProxy === 'start') {
-            StartDatabaseProxy::dispatch($database)->onQueue('high');
+            StartDatabaseProxy::dispatch($database);
        } elseif ($whatToDoWithDatabaseProxy === 'stop') {
-            StopDatabaseProxy::dispatch($database)->onQueue('high');
+            StopDatabaseProxy::dispatch($database);
        }

        return response()->json([
@@ -1151,7 +1151,7 @@ class DatabasesController extends Controller
            }
            $database = create_standalone_postgresql($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }
            $database->refresh();
            $payload = [
@@ -1206,7 +1206,7 @@ class DatabasesController extends Controller
            }
            $database = create_standalone_mariadb($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            $database->refresh();
@@ -1264,7 +1264,7 @@ class DatabasesController extends Controller
            }
            $database = create_standalone_mysql($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            $database->refresh();
@@ -1320,7 +1320,7 @@ class DatabasesController extends Controller
            }
            $database = create_standalone_redis($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            $database->refresh();
@@ -1357,7 +1357,7 @@ class DatabasesController extends Controller
            removeUnnecessaryFieldsFromRequest($request);
            $database = create_standalone_dragonfly($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            return response()->json(serializeApiResponse([
@@ -1406,7 +1406,7 @@ class DatabasesController extends Controller
            }
            $database = create_standalone_keydb($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            $database->refresh();
@@ -1442,7 +1442,7 @@ class DatabasesController extends Controller
            removeUnnecessaryFieldsFromRequest($request);
            $database = create_standalone_clickhouse($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            $database->refresh();
@@ -1500,7 +1500,7 @@ class DatabasesController extends Controller
            }
            $database = create_standalone_mongodb($environment->id, $destination->uuid, $request->all());
            if ($instantDeploy) {
-                StartDatabase::dispatch($database)->onQueue('high');
+                StartDatabase::dispatch($database);
            }

            $database->refresh();
@@ -1593,7 +1593,7 @@ class DatabasesController extends Controller
            deleteVolumes: $request->query->get('delete_volumes', true),
            dockerCleanup: $request->query->get('docker_cleanup', true),
            deleteConnectedNetworks: $request->query->get('delete_connected_networks', true)
-        )->onQueue('high');
+        );

        return response()->json([
            'message' => 'Database deletion request queued.',
@@ -1666,7 +1666,7 @@ class DatabasesController extends Controller
        if (str($database->status)->contains('running')) {
            return response()->json(['message' => 'Database is already running.'], 400);
        }
-        StartDatabase::dispatch($database)->onQueue('high');
+        StartDatabase::dispatch($database);

        return response()->json(
            [
@@ -1742,7 +1742,7 @@ class DatabasesController extends Controller
        if (str($database->status)->contains('stopped') || str($database->status)->contains('exited')) {
            return response()->json(['message' => 'Database is already stopped.'], 400);
        }
-        StopDatabase::dispatch($database)->onQueue('high');
+        StopDatabase::dispatch($database);

        return response()->json(
            [
@@ -1815,7 +1815,7 @@ class DatabasesController extends Controller
        if (! $database) {
            return response()->json(['message' => 'Database not found.'], 404);
        }
-        RestartDatabase::dispatch($database)->onQueue('high');
+        RestartDatabase::dispatch($database);

        return response()->json(
            [
--- a/app/Http/Controllers/Api/DeployController.php
+++ b/app/Http/Controllers/Api/DeployController.php
@@ -307,7 +307,7 @@ class DeployController extends Controller
                break;
            default:
                // Database resource
-                StartDatabase::dispatch($resource)->onQueue('high');
+                StartDatabase::dispatch($resource);
                $resource->update([
                    'started_at' => now(),
                ]);
--- a/app/Http/Controllers/Api/ServersController.php
+++ b/app/Http/Controllers/Api/ServersController.php
@@ -550,7 +550,7 @@ class ServersController extends Controller
            'is_build_server' => $request->is_build_server,
        ]);
        if ($request->instant_validate) {
-            ValidateServer::dispatch($server)->onQueue('high');
+            ValidateServer::dispatch($server);
        }

        return response()->json([
@@ -675,7 +675,7 @@ class ServersController extends Controller
            ]);
        }
        if ($request->instant_validate) {
-            ValidateServer::dispatch($server)->onQueue('high');
+            ValidateServer::dispatch($server);
        }

        return response()->json([
@@ -813,7 +813,7 @@ class ServersController extends Controller
        if (! $server) {
            return response()->json(['message' => 'Server not found.'], 404);
        }
-        ValidateServer::dispatch($server)->onQueue('high');
+        ValidateServer::dispatch($server);

        return response()->json(['message' => 'Validation started.']);
    }
--- a/app/Http/Controllers/Api/ServicesController.php
+++ b/app/Http/Controllers/Api/ServicesController.php
@@ -342,7 +342,7 @@ class ServicesController extends Controller
                }
                $service->parse(isNew: true);
                if ($instantDeploy) {
-                    StartService::dispatch($service)->onQueue('high');
+                    StartService::dispatch($service);
                }
                $domains = $service->applications()->get()->pluck('fqdn')->sort();
                $domains = $domains->map(function ($domain) {
@@ -487,7 +487,7 @@ class ServicesController extends Controller
            deleteVolumes: $request->query->get('delete_volumes', true),
            dockerCleanup: $request->query->get('docker_cleanup', true),
            deleteConnectedNetworks: $request->query->get('delete_connected_networks', true)
-        )->onQueue('high');
+        );

        return response()->json([
            'message' => 'Service deletion request queued.',
@@ -1076,7 +1076,7 @@ class ServicesController extends Controller
        if (str($service->status())->contains('running')) {
            return response()->json(['message' => 'Service is already running.'], 400);
        }
-        StartService::dispatch($service)->onQueue('high');
+        StartService::dispatch($service);

        return response()->json(
            [
@@ -1154,7 +1154,7 @@ class ServicesController extends Controller
        if (str($service->status())->contains('stopped') || str($service->status())->contains('exited')) {
            return response()->json(['message' => 'Service is already stopped.'], 400);
        }
-        StopService::dispatch($service)->onQueue('high');
+        StopService::dispatch($service);

        return response()->json(
            [
@@ -1229,7 +1229,7 @@ class ServicesController extends Controller
        if (! $service) {
            return response()->json(['message' => 'Service not found.'], 404);
        }
-        RestartService::dispatch($service)->onQueue('high');
+        RestartService::dispatch($service);

        return response()->json(
            [
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -166,6 +166,8 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue

    public function __construct(int $application_deployment_queue_id)
    {
+        $this->onQueue('high');
+
        $this->application_deployment_queue = ApplicationDeploymentQueue::find($application_deployment_queue_id);
        $this->application = Application::find($this->application_deployment_queue->application_id);
        $this->build_pack = data_get($this->application, 'build_pack');
@@ -349,8 +351,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
    private function post_deployment()
    {
        if ($this->server->isProxyShouldRun()) {
-            GetContainersStatus::dispatch($this->server)->onQueue('high');
-            // dispatch(new ContainerStatusJob($this->server));
+            GetContainersStatus::dispatch($this->server);
        }
        $this->next(ApplicationDeploymentStatus::FINISHED->value);
        if ($this->pull_request_id !== 0) {
--- a/app/Jobs/ApplicationPullRequestUpdateJob.php
+++ b/app/Jobs/ApplicationPullRequestUpdateJob.php
@@ -25,7 +25,9 @@ class ApplicationPullRequestUpdateJob implements ShouldBeEncrypted, ShouldQueue
        public ApplicationPreview $preview,
        public ProcessStatus $status,
        public ?string $deployment_uuid = null
-    ) {}
+    ) {
+        $this->onQueue('high');
+    }

    public function handle()
    {
--- a/app/Jobs/CoolifyTask.php
+++ b/app/Jobs/CoolifyTask.php
@@ -23,7 +23,10 @@ class CoolifyTask implements ShouldBeEncrypted, ShouldQueue
        public bool $ignore_errors,
        public $call_event_on_finish,
        public $call_event_data,
-    ) {}
+    ) {
+
+        $this->onQueue('high');
+    }

    /**
     * Execute the job.
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -60,6 +60,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue

    public function __construct($backup)
    {
+        $this->onQueue('high');
        $this->backup = $backup;
    }

--- a/app/Jobs/DeleteResourceJob.php
+++ b/app/Jobs/DeleteResourceJob.php
@@ -35,7 +35,9 @@ class DeleteResourceJob implements ShouldBeEncrypted, ShouldQueue
        public bool $deleteVolumes = true,
        public bool $dockerCleanup = true,
        public bool $deleteConnectedNetworks = true
-    ) {}
+    ) {
+        $this->onQueue('high');
+    }

    public function handle()
    {
--- a/app/Jobs/PullHelperImageJob.php
+++ b/app/Jobs/PullHelperImageJob.php
@@ -16,7 +16,10 @@ class PullHelperImageJob implements ShouldBeEncrypted, ShouldQueue

    public $timeout = 1000;

-    public function __construct(public Server $server) {}
+    public function __construct(public Server $server)
+    {
+        $this->onQueue('high');
+    }

    public function handle(): void
    {
--- a/app/Jobs/PullTemplatesFromCDN.php
+++ b/app/Jobs/PullTemplatesFromCDN.php
@@ -17,7 +17,10 @@ class PullTemplatesFromCDN implements ShouldBeEncrypted, ShouldQueue

    public $timeout = 10;

-    public function __construct() {}
+    public function __construct()
+    {
+        $this->onQueue('high');
+    }

    public function handle(): void
    {
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -360,7 +360,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
    private function checkLogDrainContainer()
    {
        if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) {
-            StartLogDrain::dispatch($this->server)->onQueue('high');
+            StartLogDrain::dispatch($this->server);
        }
    }
 }
--- a/app/Jobs/ScheduledTaskJob.php
+++ b/app/Jobs/ScheduledTaskJob.php
@@ -40,6 +40,8 @@ class ScheduledTaskJob implements ShouldQueue

    public function __construct($task)
    {
+        $this->onQueue('high');
+
        $this->task = $task;
        if ($service = $task->service()->first()) {
            $this->resource = $service;
--- a/app/Jobs/SendMessageToDiscordJob.php
+++ b/app/Jobs/SendMessageToDiscordJob.php
@@ -32,7 +32,9 @@ class SendMessageToDiscordJob implements ShouldBeEncrypted, ShouldQueue
    public function __construct(
        public DiscordMessage $message,
        public string $webhookUrl
-    ) {}
+    ) {
+        $this->onQueue('high');
+    }

    /**
     * Execute the job.
--- a/app/Jobs/SendMessageToTelegramJob.php
+++ b/app/Jobs/SendMessageToTelegramJob.php
@@ -33,7 +33,9 @@ class SendMessageToTelegramJob implements ShouldBeEncrypted, ShouldQueue
        public string $token,
        public string $chatId,
        public ?string $topicId = null,
-    ) {}
+    ) {
+        $this->onQueue('high');
+    }

    /**
     * Execute the job.
--- a/app/Jobs/ServerCheckJob.php
+++ b/app/Jobs/ServerCheckJob.php
@@ -94,10 +94,10 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
        if ($foundLogDrainContainer) {
            $status = data_get($foundLogDrainContainer, 'State.Status');
            if ($status !== 'running') {
-                StartLogDrain::dispatch($this->server)->onQueue('high');
+                StartLogDrain::dispatch($this->server);
            }
        } else {
-            StartLogDrain::dispatch($this->server)->onQueue('high');
+            StartLogDrain::dispatch($this->server);
        }
    }
 }
--- a/app/Jobs/ServerFilesFromServerJob.php
+++ b/app/Jobs/ServerFilesFromServerJob.php
@@ -16,7 +16,10 @@ class ServerFilesFromServerJob implements ShouldBeEncrypted, ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

-    public function __construct(public ServiceApplication|ServiceDatabase|Application $resource) {}
+    public function __construct(public ServiceApplication|ServiceDatabase|Application $resource)
+    {
+        $this->onQueue('high');
+    }

    public function handle()
    {
--- a/app/Jobs/ServerStorageSaveJob.php
+++ b/app/Jobs/ServerStorageSaveJob.php
@@ -14,7 +14,10 @@ class ServerStorageSaveJob implements ShouldBeEncrypted, ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

-    public function __construct(public LocalFileVolume $localFileVolume) {}
+    public function __construct(public LocalFileVolume $localFileVolume)
+    {
+        $this->onQueue('high');
+    }

    public function handle()
    {
--- a/app/Jobs/SubscriptionInvoiceFailedJob.php
+++ b/app/Jobs/SubscriptionInvoiceFailedJob.php
@@ -15,7 +15,10 @@ class SubscriptionInvoiceFailedJob implements ShouldBeEncrypted, ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

-    public function __construct(protected Team $team) {}
+    public function __construct(protected Team $team)
+    {
+        $this->onQueue('high');
+    }

    public function handle()
    {
--- a/app/Jobs/UpdateCoolifyJob.php
+++ b/app/Jobs/UpdateCoolifyJob.php
@@ -18,6 +18,11 @@ class UpdateCoolifyJob implements ShouldBeEncrypted, ShouldQueue

    public $timeout = 600;

+    public function __construct()
+    {
+        $this->onQueue('high');
+    }
+
    public function handle(): void
    {
        try {
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -45,13 +45,11 @@ class Heading extends Component
    public function check_status($showNotification = false)
    {
        if ($this->application->destination->server->isFunctional()) {
-            GetContainersStatus::dispatch($this->application->destination->server)->onQueue('high');
+            GetContainersStatus::dispatch($this->application->destination->server);
        }
        if ($showNotification) {
            $this->dispatch('success', 'Success', 'Application status updated.');
        }
-        // Removed because it caused flickering
-        // $this->dispatch('configurationChanged');
    }

    public function force_deploy_without_cache()
--- a/app/Notifications/Application/DeploymentFailed.php
+++ b/app/Notifications/Application/DeploymentFailed.php
@@ -34,6 +34,7 @@ class DeploymentFailed extends Notification implements ShouldQueue

    public function __construct(Application $application, string $deployment_uuid, ?ApplicationPreview $preview = null)
    {
+        $this->onQueue('high');
        $this->application = $application;
        $this->deployment_uuid = $deployment_uuid;
        $this->preview = $preview;
--- a/app/Notifications/Application/DeploymentSuccess.php
+++ b/app/Notifications/Application/DeploymentSuccess.php
@@ -34,6 +34,7 @@ class DeploymentSuccess extends Notification implements ShouldQueue

    public function __construct(Application $application, string $deployment_uuid, ?ApplicationPreview $preview = null)
    {
+        $this->onQueue('high');
        $this->application = $application;
        $this->deployment_uuid = $deployment_uuid;
        $this->preview = $preview;
--- a/app/Notifications/Application/StatusChanged.php
+++ b/app/Notifications/Application/StatusChanged.php
@@ -27,6 +27,7 @@ class StatusChanged extends Notification implements ShouldQueue

    public function __construct(public Application $resource)
    {
+        $this->onQueue('high');
        $this->resource_name = data_get($resource, 'name');
        $this->project_uuid = data_get($resource, 'environment.project.uuid');
        $this->environment_name = data_get($resource, 'environment.name');
--- a/app/Notifications/Channels/DiscordChannel.php
+++ b/app/Notifications/Channels/DiscordChannel.php
@@ -17,6 +17,6 @@ class DiscordChannel
        if (! $webhookUrl) {
            return;
        }
-        dispatch(new SendMessageToDiscordJob($message, $webhookUrl))->onQueue('high');
+        SendMessageToDiscordJob::dispatch($message, $webhookUrl);
    }
 }
--- a/app/Notifications/Channels/TelegramChannel.php
+++ b/app/Notifications/Channels/TelegramChannel.php
@@ -41,6 +41,6 @@ class TelegramChannel
        if (! $telegramToken || ! $chatId || ! $message) {
            return;
        }
-        dispatch(new SendMessageToTelegramJob($message, $buttons, $telegramToken, $chatId, $topicId))->onQueue('high');
+        SendMessageToTelegramJob::dispatch($message, $buttons, $telegramToken, $chatId, $topicId);
    }
 }
--- a/app/Notifications/Container/ContainerRestarted.php
+++ b/app/Notifications/Container/ContainerRestarted.php
@@ -15,7 +15,10 @@ class ContainerRestarted extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public string $name, public Server $server, public ?string $url = null) {}
+    public function __construct(public string $name, public Server $server, public ?string $url = null)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/Container/ContainerStopped.php
+++ b/app/Notifications/Container/ContainerStopped.php
@@ -15,7 +15,10 @@ class ContainerStopped extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public string $name, public Server $server, public ?string $url = null) {}
+    public function __construct(public string $name, public Server $server, public ?string $url = null)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/Database/BackupFailed.php
+++ b/app/Notifications/Database/BackupFailed.php
@@ -23,6 +23,7 @@ class BackupFailed extends Notification implements ShouldQueue

    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output, public $database_name)
    {
+        $this->onQueue('high');
        $this->name = $database->name;
        $this->frequency = $backup->frequency;
    }
--- a/app/Notifications/Database/BackupSuccess.php
+++ b/app/Notifications/Database/BackupSuccess.php
@@ -23,6 +23,7 @@ class BackupSuccess extends Notification implements ShouldQueue

    public function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name)
    {
+        $this->onQueue('high');
        $this->name = $database->name;
        $this->frequency = $backup->frequency;
    }
--- a/app/Notifications/Internal/GeneralNotification.php
+++ b/app/Notifications/Internal/GeneralNotification.php
@@ -15,7 +15,10 @@ class GeneralNotification extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public string $message) {}
+    public function __construct(public string $message)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/ScheduledTask/TaskFailed.php
+++ b/app/Notifications/ScheduledTask/TaskFailed.php
@@ -21,6 +21,7 @@ class TaskFailed extends Notification implements ShouldQueue

    public function __construct(public ScheduledTask $task, public string $output)
    {
+        $this->onQueue('high');
        if ($task->application) {
            $this->url = $task->application->failedTaskLink($task->uuid);
        } elseif ($task->service) {
--- a/app/Notifications/Server/DockerCleanup.php
+++ b/app/Notifications/Server/DockerCleanup.php
@@ -16,7 +16,10 @@ class DockerCleanup extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public Server $server, public string $message) {}
+    public function __construct(public Server $server, public string $message)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/Server/ForceDisabled.php
+++ b/app/Notifications/Server/ForceDisabled.php
@@ -18,7 +18,10 @@ class ForceDisabled extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public Server $server) {}
+    public function __construct(public Server $server)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/Server/ForceEnabled.php
+++ b/app/Notifications/Server/ForceEnabled.php
@@ -18,7 +18,10 @@ class ForceEnabled extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public Server $server) {}
+    public function __construct(public Server $server)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/Server/HighDiskUsage.php
+++ b/app/Notifications/Server/HighDiskUsage.php
@@ -15,7 +15,10 @@ class HighDiskUsage extends Notification implements ShouldQueue

    public $tries = 1;

-    public function __construct(public Server $server, public int $disk_usage, public int $server_disk_usage_notification_threshold) {}
+    public function __construct(public Server $server, public int $disk_usage, public int $server_disk_usage_notification_threshold)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/Server/Reachable.php
+++ b/app/Notifications/Server/Reachable.php
@@ -22,6 +22,7 @@ class Reachable extends Notification implements ShouldQueue

    public function __construct(public Server $server)
    {
+        $this->onQueue('high');
        $this->isRateLimited = isEmailRateLimited(
            limiterKey: 'server-reachable:'.$this->server->id,
        );
--- a/app/Notifications/Server/Unreachable.php
+++ b/app/Notifications/Server/Unreachable.php
@@ -22,6 +22,7 @@ class Unreachable extends Notification implements ShouldQueue

    public function __construct(public Server $server)
    {
+        $this->onQueue('high');
        $this->isRateLimited = isEmailRateLimited(
            limiterKey: 'server-unreachable:'.$this->server->id,
        );
--- a/app/Notifications/Test.php
+++ b/app/Notifications/Test.php
@@ -15,7 +15,10 @@ class Test extends Notification implements ShouldQueue

    public $tries = 5;

-    public function __construct(public ?string $emails = null) {}
+    public function __construct(public ?string $emails = null)
+    {
+        $this->onQueue('high');
+    }

    public function via(object $notifiable): array
    {
--- a/app/Notifications/TransactionalEmails/InvitationLink.php
+++ b/app/Notifications/TransactionalEmails/InvitationLink.php
@@ -22,7 +22,10 @@ class InvitationLink extends Notification implements ShouldQueue
        return [TransactionalEmailChannel::class];
    }

-    public function __construct(public User $user) {}
+    public function __construct(public User $user)
+    {
+        $this->onQueue('high');
+    }

    public function toMail(): MailMessage
    {
--- a/app/Notifications/TransactionalEmails/Test.php
+++ b/app/Notifications/TransactionalEmails/Test.php
@@ -14,7 +14,10 @@ class Test extends Notification implements ShouldQueue

    public $tries = 5;

-    public function __construct(public string $emails) {}
+    public function __construct(public string $emails)
+    {
+        $this->onQueue('high');
+    }

    public function via(): array
    {
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@@ -44,13 +44,13 @@ function queue_application_deployment(Application $application, string $deployme
    ]);

    if ($no_questions_asked) {
-        dispatch(new ApplicationDeploymentJob(
+        ApplicationDeploymentJob::dispatch(
            application_deployment_queue_id: $deployment->id,
-        ))->onQueue('high');
+        );
    } elseif (next_queuable($server_id, $application_id)) {
-        dispatch(new ApplicationDeploymentJob(
+        ApplicationDeploymentJob::dispatch(
            application_deployment_queue_id: $deployment->id,
-        ))->onQueue('high');
+        );
    }
 }
 function force_start_deployment(ApplicationDeploymentQueue $deployment)
@@ -59,9 +59,9 @@ function force_start_deployment(ApplicationDeploymentQueue $deployment)
        'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
    ]);

-    dispatch(new ApplicationDeploymentJob(
+    ApplicationDeploymentJob::dispatch(
        application_deployment_queue_id: $deployment->id,
-    ))->onQueue('high');
+    );
 }
 function queue_next_deployment(Application $application)
 {
@@ -72,9 +72,9 @@ function queue_next_deployment(Application $application)
            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
        ]);

-        dispatch(new ApplicationDeploymentJob(
+        ApplicationDeploymentJob::dispatch(
            application_deployment_queue_id: $next_found->id,
-        ))->onQueue('high');
+        );
    }
 }

@@ -113,9 +113,9 @@ function next_after_cancel(?Server $server = null)
                        'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
                    ]);

-                    dispatch(new ApplicationDeploymentJob(
+                    ApplicationDeploymentJob::dispatch(
                        application_deployment_queue_id: $next->id,
-                    ))->onQueue('high');
+                    );
                }
                break;
            }