From 4d78ac47894edd50100bd2823160a205f14eca94 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 9 Apr 2024 12:28:05 +0200 Subject: [PATCH 1/6] Remove unnecessary sed command in install.sh script --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 7bb928634..3bc299a14 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -23,7 +23,7 @@ if [ "$OS_TYPE" = 'amzn' ]; then dnf install -y findutils >/dev/null 2>&1 fi -LATEST_VERSION=$(curl --silent $CDN/versions.json | grep -i version | sed -n '2p' | xargs | awk '{print $2}' | tr -d ',') +LATEST_VERSION=$(curl --silent $CDN/versions.json | grep -i version | xargs | awk '{print $2}' | tr -d ',') DATE=$(date +"%Y%m%d-%H%M%S") if [ $EUID != 0 ]; then From 3ff78a3a47a22f0b5d0c213d754c550c72d99210 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 9 Apr 2024 12:28:11 +0200 Subject: [PATCH 2/6] Update version to 1.3.1 in install.sh --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 3bc299a14..f377c85bc 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status #set -u # Treat unset variables as an error and exit set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status -VERSION="1.3.0" +VERSION="1.3.1" DOCKER_VERSION="24.0" CDN="https://cdn.coollabs.io/coolify" From 9ae3743a58d22ed04a4dc14af5482737b3ff3f55 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 9 Apr 2024 12:48:58 +0200 Subject: [PATCH 3/6] Update job schedules and version numbers --- app/Console/Kernel.php | 8 ++++---- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index dbb8e6ead..9089ba3e4 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -38,7 +38,7 @@ class Kernel extends ConsoleKernel $schedule->command('horizon:snapshot')->everyFiveMinutes(); $schedule->command('cleanup:unreachable-servers')->daily(); - $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer(); + $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer(); // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer(); // Server Jobs @@ -70,13 +70,13 @@ class Kernel extends ConsoleKernel $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false); } foreach ($containerServers as $server) { - $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer(); + $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer(); if ($server->isLogDrainEnabled()) { - $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer(); + $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer(); } } foreach ($servers as $server) { - $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer(); + $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer(); } } private function instance_auto_update($schedule) diff --git a/config/sentry.php b/config/sentry.php index f1d8aa314..a09d9434f 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // 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.253', + 'release' => '4.0.0-beta.254', // 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 e92f47087..7cbdc502f 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Tue, 9 Apr 2024 13:02:16 +0200 Subject: [PATCH 4/6] Commented out ray() function call in remoteProcess.php --- bootstrap/helpers/remoteProcess.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/helpers/remoteProcess.php b/bootstrap/helpers/remoteProcess.php index bfb86406c..6365a6e45 100644 --- a/bootstrap/helpers/remoteProcess.php +++ b/bootstrap/helpers/remoteProcess.php @@ -159,7 +159,7 @@ function generateSshCommand(Server $server, string $command) . $command . PHP_EOL . $delimiter; // ray($ssh_command); - ray($delimiter); + // ray($delimiter); return $ssh_command; } function instant_remote_process(Collection|array $command, Server $server, $throwError = true) From b21cb5c0e90ebddd8ac1ec006ccb5963781c9d8e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 9 Apr 2024 13:02:22 +0200 Subject: [PATCH 5/6] Update job schedules to run every two minutes instead of every minute --- app/Console/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 9089ba3e4..dbb8e6ead 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -38,7 +38,7 @@ class Kernel extends ConsoleKernel $schedule->command('horizon:snapshot')->everyFiveMinutes(); $schedule->command('cleanup:unreachable-servers')->daily(); - $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer(); + $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer(); // $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer(); // Server Jobs @@ -70,13 +70,13 @@ class Kernel extends ConsoleKernel $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false); } foreach ($containerServers as $server) { - $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer(); + $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer(); if ($server->isLogDrainEnabled()) { - $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer(); + $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer(); } } foreach ($servers as $server) { - $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer(); + $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer(); } } private function instance_auto_update($schedule) From bd25860ccfe0f9c2290a365bd0fe910fbc5da7b4 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 9 Apr 2024 13:03:06 +0200 Subject: [PATCH 6/6] Add check for enabled tasks in scheduled tasks loop --- app/Console/Kernel.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index dbb8e6ead..835c0afe2 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -121,6 +121,9 @@ class Kernel extends ConsoleKernel return; } foreach ($scheduled_tasks as $scheduled_task) { + if ($scheduled_task->enabled === false) { + continue; + } $service = $scheduled_task->service; $application = $scheduled_task->application;