From 075f3ce93063d5b5268ab49604624d83c6605423 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 30 Dec 2023 15:29:26 +0100 Subject: [PATCH] remove unnecessary queue --- bootstrap/helpers/applications.php | 8 ++++---- config/horizon.php | 23 ----------------------- config/queue.php | 8 -------- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 6 files changed, 7 insertions(+), 38 deletions(-) diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php index cfd5c4ebc..d3e28d524 100644 --- a/bootstrap/helpers/applications.php +++ b/bootstrap/helpers/applications.php @@ -41,11 +41,11 @@ function queue_application_deployment(int $application_id, string $deployment_uu dispatch(new ApplicationDeploymentNewJob( deployment: $deployment, application: Application::find($application_id) - ))->onConnection('long-running')->onQueue('long-running'); + )); } else { dispatch(new ApplicationDeploymentJob( application_deployment_queue_id: $deployment->id, - ))->onConnection('long-running')->onQueue('long-running'); + )); } } @@ -57,11 +57,11 @@ function queue_next_deployment(Application $application, bool $isNew = false) dispatch(new ApplicationDeploymentNewJob( deployment: $next_found, application: $application - ))->onConnection('long-running')->onQueue('long-running'); + )); } else { dispatch(new ApplicationDeploymentJob( application_deployment_queue_id: $next_found->id, - ))->onConnection('long-running')->onQueue('long-running'); + )); } } } diff --git a/config/horizon.php b/config/horizon.php index 060e67bad..3d01aca5f 100644 --- a/config/horizon.php +++ b/config/horizon.php @@ -190,17 +190,6 @@ 'maxJobs' => 0, 'memory' => 128, 'tries' => 1, - 'timeout' => 300, - 'nice' => 0, - ], - 'long-running' => [ - 'connection' => 'redis', - 'queue' => ['long-running'], - 'balance' => 'auto', - 'maxTime' => 0, - 'maxJobs' => 0, - 'memory' => 128, - 'tries' => 1, 'timeout' => 3560, 'nice' => 0, ], @@ -209,12 +198,6 @@ 'environments' => [ 'production' => [ 's6' => [ - 'autoScalingStrategy' => 'size', - 'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2), - 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1), - 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1), - ], - 'long-running' => [ 'autoScalingStrategy' => 'size', 'maxProcesses' => env('HORIZON_MAX_PROCESSES', 6), 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1), @@ -224,12 +207,6 @@ 'local' => [ 's6' => [ - 'autoScalingStrategy' => 'size', - 'maxProcesses' => env('HORIZON_MAX_PROCESSES', 2), - 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1), - 'balanceCooldown' => env('HORIZON_BALANCE_COOLDOWN', 1), - ], - 'long-running' => [ 'autoScalingStrategy' => 'size', 'maxProcesses' => env('HORIZON_MAX_PROCESSES', 6), 'balanceMaxShift' => env('HORIZON_BALANCE_MAX_SHIFT', 1), diff --git a/config/queue.php b/config/queue.php index fb846f999..29b79353a 100644 --- a/config/queue.php +++ b/config/queue.php @@ -33,14 +33,6 @@ 'sync' => [ 'driver' => 'sync', ], - 'long-running' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => 'long-running', - 'retry_after' => 3600, - 'block_for' => null, - 'after_commit' => true, - ], 'database' => [ 'driver' => 'database', 'table' => 'jobs', diff --git a/config/sentry.php b/config/sentry.php index 150fd9d8b..2c961e4ee 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.175', + 'release' => '4.0.0-beta.176', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 6b0870bf8..32a6f4ada 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@