From 8a39a4469a06c62d3ba5be57d7cfeed09e29c955 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 11 Sep 2023 22:29:34 +0200 Subject: [PATCH] fix: proxy check, reduce jobs, etc --- app/Actions/Proxy/StartProxy.php | 9 ++-- app/Console/Commands/TestEmail.php | 1 - app/Console/Kernel.php | 22 +++++--- app/Http/Livewire/Server/Proxy.php | 9 ++-- app/Http/Livewire/Server/Proxy/Deploy.php | 9 +++- app/Http/Livewire/Server/Proxy/Status.php | 27 +++++++--- app/Http/Livewire/Settings/Configuration.php | 4 +- app/Jobs/ApplicationDeploymentJob.php | 2 +- app/Jobs/ProxyCheckJob.php | 46 ----------------- app/Jobs/ProxyContainerStatusJob.php | 51 +++++++++++++------ app/Jobs/ProxyStartJob.php | 44 ---------------- app/Jobs/ResourceStatusJob.php | 46 ----------------- app/Models/Server.php | 22 ++++++-- app/View/Components/Modal.php | 7 +-- resources/views/components/modal.blade.php | 3 +- .../views/livewire/server/form.blade.php | 7 ++- .../views/livewire/server/proxy.blade.php | 23 ++++++--- .../livewire/server/proxy/deploy.blade.php | 17 ++----- .../livewire/server/proxy/status.blade.php | 11 +++- 19 files changed, 146 insertions(+), 214 deletions(-) delete mode 100755 app/Jobs/ProxyCheckJob.php delete mode 100755 app/Jobs/ProxyStartJob.php delete mode 100644 app/Jobs/ResourceStatusJob.php diff --git a/app/Actions/Proxy/StartProxy.php b/app/Actions/Proxy/StartProxy.php index 70dcbdab3..d8a14d27e 100644 --- a/app/Actions/Proxy/StartProxy.php +++ b/app/Actions/Proxy/StartProxy.php @@ -2,8 +2,6 @@ namespace App\Actions\Proxy; -use App\Enums\ProxyStatus; -use App\Enums\ProxyTypes; use App\Models\Server; use Illuminate\Support\Str; use Spatie\Activitylog\Models\Activity; @@ -36,11 +34,14 @@ public function __invoke(Server $server): Activity "echo '####### Creating Docker Compose file...'", "echo '####### Pulling docker image...'", 'docker compose pull', - "echo '####### Stopping existing proxy...'", + "echo '####### Stopping existing coolify-proxy...'", 'docker compose down -v --remove-orphans', "lsof -nt -i:80 | xargs -r kill -9", "lsof -nt -i:443 | xargs -r kill -9", - "echo '####### Starting proxy...'", + "systemctl disable nginx > /dev/null 2>&1 || true", + "systemctl disable apache2 > /dev/null 2>&1 || true", + "systemctl disable apache > /dev/null 2>&1 || true", + "echo '####### Starting coolify-proxy...'", 'docker compose up -d --remove-orphans', "echo '####### Proxy installed successfully...'" ], $server); diff --git a/app/Console/Commands/TestEmail.php b/app/Console/Commands/TestEmail.php index 682848a05..4e29d7962 100644 --- a/app/Console/Commands/TestEmail.php +++ b/app/Console/Commands/TestEmail.php @@ -21,7 +21,6 @@ use Illuminate\Console\Command; use Illuminate\Mail\Message; use Illuminate\Notifications\Messages\MailMessage; -use Illuminate\Support\Facades\Process; use Mail; use Str; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 276a27067..85fa80aac 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -2,6 +2,7 @@ namespace App\Console; +use App\Enums\ProxyTypes; use App\Jobs\ApplicationContainerStatusJob; use App\Jobs\CheckResaleLicenseJob; use App\Jobs\CleanupInstanceStuffsJob; @@ -9,11 +10,11 @@ use App\Jobs\DatabaseContainerStatusJob; use App\Jobs\DockerCleanupJob; use App\Jobs\InstanceAutoUpdateJob; -use App\Jobs\ProxyCheckJob; -use App\Jobs\ResourceStatusJob; +use App\Jobs\ProxyContainerStatusJob; use App\Models\Application; use App\Models\InstanceSettings; use App\Models\ScheduledDatabaseBackup; +use App\Models\Server; use App\Models\StandalonePostgresql; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; @@ -24,22 +25,26 @@ protected function schedule(Schedule $schedule): void { if (isDev()) { $schedule->command('horizon:snapshot')->everyMinute(); - // $schedule->job(new ResourceStatusJob)->everyMinute(); - $schedule->job(new ProxyCheckJob)->everyFiveMinutes(); $schedule->job(new CleanupInstanceStuffsJob)->everyMinute(); // $schedule->job(new CheckResaleLicenseJob)->hourly(); $schedule->job(new DockerCleanupJob)->everyOddHour(); } else { $schedule->command('horizon:snapshot')->everyFiveMinutes(); $schedule->job(new CleanupInstanceStuffsJob)->everyTenMinutes()->onOneServer(); - // $schedule->job(new ResourceStatusJob)->everyMinute()->onOneServer(); $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer(); - $schedule->job(new ProxyCheckJob)->everyFiveMinutes()->onOneServer(); $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer(); } $this->instance_auto_update($schedule); $this->check_scheduled_backups($schedule); $this->check_resources($schedule); + $this->check_proxies($schedule); + } + private function check_proxies($schedule) + { + $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->whereNotNull('proxy.type')->where('proxy.type', '!=', ProxyTypes::NONE->value); + foreach ($servers as $server) { + $schedule->job(new ProxyContainerStatusJob($server))->everyMinute()->onOneServer(); + } } private function check_resources($schedule) { @@ -53,7 +58,8 @@ private function check_resources($schedule) $schedule->job(new DatabaseContainerStatusJob($postgresql))->everyMinute()->onOneServer(); } } - private function instance_auto_update($schedule){ + private function instance_auto_update($schedule) + { if (isDev()) { return; } @@ -74,7 +80,7 @@ private function check_scheduled_backups($schedule) if (!$scheduled_backup->enabled) { continue; } - if (is_null(data_get($scheduled_backup,'database'))) { + if (is_null(data_get($scheduled_backup, 'database'))) { ray('database not found'); $scheduled_backup->delete(); continue; diff --git a/app/Http/Livewire/Server/Proxy.php b/app/Http/Livewire/Server/Proxy.php index c11476d65..7f0a11f98 100644 --- a/app/Http/Livewire/Server/Proxy.php +++ b/app/Http/Livewire/Server/Proxy.php @@ -14,14 +14,14 @@ class Proxy extends Component public ?string $selectedProxy = null; public $proxy_settings = null; - public string|null $redirect_url = null; + public ?string $redirect_url = null; protected $listeners = ['proxyStatusUpdated', 'saveConfiguration' => 'submit']; public function mount() { - $this->selectedProxy = $this->server->proxy->type; - $this->redirect_url = $this->server->proxy->redirect_url; + $this->selectedProxy = data_get($this->server, 'proxy.type'); + $this->redirect_url = data_get($this->server, 'proxy.redirect_url'); } public function proxyStatusUpdated() @@ -69,9 +69,10 @@ public function reset_proxy_configuration() } } - public function load_proxy_configuration() + public function loadProxyConfiguration() { try { + ray('loadProxyConfiguration'); $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server); } catch (\Throwable $e) { return general_error_handler(err: $e); diff --git a/app/Http/Livewire/Server/Proxy/Deploy.php b/app/Http/Livewire/Server/Proxy/Deploy.php index f78763479..19e421d1f 100644 --- a/app/Http/Livewire/Server/Proxy/Deploy.php +++ b/app/Http/Livewire/Server/Proxy/Deploy.php @@ -10,15 +10,20 @@ class Deploy extends Component { public Server $server; public $proxy_settings = null; + protected $listeners = ['proxyStatusUpdated']; - public function start_proxy() + public function proxyStatusUpdated() { + $this->server->refresh(); + } + public function startProxy() { if ( $this->server->proxy->last_applied_settings && $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings ) { - $this->emit('saveConfiguration', $this->server); + resolve(SaveConfigurationSync::class)($this->server, $this->proxy_settings); } + $activity = resolve(StartProxy::class)($this->server); $this->emit('newMonitorActivity', $activity->id); } diff --git a/app/Http/Livewire/Server/Proxy/Status.php b/app/Http/Livewire/Server/Proxy/Status.php index 352a1df52..be0189f54 100644 --- a/app/Http/Livewire/Server/Proxy/Status.php +++ b/app/Http/Livewire/Server/Proxy/Status.php @@ -2,7 +2,6 @@ namespace App\Http\Livewire\Server\Proxy; -use App\Jobs\ProxyContainerStatusJob; use App\Models\Server; use Livewire\Component; @@ -10,14 +9,26 @@ class Status extends Component { public Server $server; - public function get_status() + protected $listeners = ['proxyStatusUpdated']; + public function proxyStatusUpdated() { + $this->server->refresh(); + } + public function getProxyStatus() { - if (data_get($this->server,'settings.is_usable')) { - dispatch_sync(new ProxyContainerStatusJob( - server: $this->server - )); - $this->server->refresh(); - $this->emit('proxyStatusUpdated'); + try { + if (data_get($this->server, 'settings.is_usable') && data_get($this->server, 'settings.is_reachable')) { + $container = getContainerStatus(server: $this->server, container_id: 'coolify-proxy'); + $this->server->proxy->status = $container; + $this->server->save(); + $this->emit('proxyStatusUpdated'); + } + } catch (\Throwable $e) { + return general_error_handler(err: $e); } + + } + public function getProxyStatusWithNoti() { + $this->emit('success', 'Refreshing proxy status.'); + $this->getProxyStatus(); } } diff --git a/app/Http/Livewire/Settings/Configuration.php b/app/Http/Livewire/Settings/Configuration.php index 965f0335b..6801823fe 100644 --- a/app/Http/Livewire/Settings/Configuration.php +++ b/app/Http/Livewire/Settings/Configuration.php @@ -2,7 +2,7 @@ namespace App\Http\Livewire\Settings; -use App\Jobs\ProxyStartJob; +use App\Jobs\ProxyContainerStatusJob; use App\Models\InstanceSettings as ModelsInstanceSettings; use App\Models\Server; use Livewire\Component; @@ -124,7 +124,7 @@ private function setup_instance_fqdn() ]; } $this->save_configuration_to_disk($traefik_dynamic_conf, $file); - dispatch(new ProxyStartJob($this->server)); + dispatch(new ProxyContainerStatusJob($this->server)); } } diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 53a6c1406..7a61029e0 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -135,7 +135,7 @@ public function handle(): void $this->deploy(); } } - if ($this->application->fqdn) dispatch(new ProxyStartJob($this->server)); + if ($this->application->fqdn) dispatch(new ProxyContainerStatusJob($this->server)); $this->next(ApplicationDeploymentStatus::FINISHED->value); } catch (Exception $e) { ray($e); diff --git a/app/Jobs/ProxyCheckJob.php b/app/Jobs/ProxyCheckJob.php deleted file mode 100755 index 65d04bf05..000000000 --- a/app/Jobs/ProxyCheckJob.php +++ /dev/null @@ -1,46 +0,0 @@ -settings->is_reachable === false || $server->settings->is_usable === false - ) { - continue; - } - $status = getContainerStatus(server: $server, container_id: $container_name); - if ($status === 'running') { - continue; - } - if (data_get($server, 'proxy.type')) { - resolve(StartProxy::class)($server); - } - } - } catch (\Throwable $e) { - ray($e->getMessage()); - send_internal_notification('ProxyCheckJob failed with: ' . $e->getMessage()); - throw $e; - } - } -} diff --git a/app/Jobs/ProxyContainerStatusJob.php b/app/Jobs/ProxyContainerStatusJob.php index a69c96ef3..1e7eac6a3 100644 --- a/app/Jobs/ProxyContainerStatusJob.php +++ b/app/Jobs/ProxyContainerStatusJob.php @@ -2,6 +2,8 @@ namespace App\Jobs; +use App\Actions\Proxy\StartProxy; +use App\Enums\ProxyStatus; use App\Enums\ProxyTypes; use App\Models\Server; use Illuminate\Bus\Queueable; @@ -11,7 +13,6 @@ use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\Middleware\WithoutOverlapping; use Illuminate\Queue\SerializesModels; -use Illuminate\Support\Str; class ProxyContainerStatusJob implements ShouldQueue, ShouldBeUnique { @@ -28,29 +29,49 @@ public function __construct(Server $server) public function middleware(): array { - return [new WithoutOverlapping($this->server->id)]; + return [new WithoutOverlapping($this->server->uuid)]; } - public function uniqueId(): int + public function uniqueId(): string { - return $this->server->id; + ray($this->server->uuid); + return $this->server->uuid; } public function handle(): void { try { - $container = getContainerStatus(server: $this->server, all_data: true, container_id: 'coolify-proxy', throwError: false); - $status = data_get($container, 'State.Status'); - if ($status && data_get($this->server, 'proxy.status') !== $status) { - $this->server->proxy->status = $status; - if ($this->server->proxy->status === 'running') { - $traefik = $container['Config']['Labels']['org.opencontainers.image.title']; - $version = $container['Config']['Labels']['org.opencontainers.image.version']; - if (isset($version) && isset($traefik) && $traefik === 'Traefik' && Str::of($version)->startsWith('v2')) { - $this->server->proxy->type = ProxyTypes::TRAEFIK_V2->value; - } + $proxyType = data_get($this->server, 'proxy.type'); + if ($proxyType === ProxyTypes::NONE->value) { + return; + } + if (is_null($proxyType)) { + if ($this->server->isProxyShouldRun()) { + $this->server->proxy->type = ProxyTypes::TRAEFIK_V2->value; + $this->server->proxy->status = ProxyStatus::EXITED->value; + $this->server->save(); + resolve(StartProxy::class)($this->server); + return; + } + } + + $container = getContainerStatus(server: $this->server, all_data: true, container_id: 'coolify-proxy', throwError: false); + $containerStatus = data_get($container, 'State.Status'); + $databaseContainerStatus = data_get($this->server, 'proxy.status', 'exited'); + + + if ($proxyType !== ProxyTypes::NONE->value) { + if ($containerStatus === 'running') { + $this->server->proxy->status = $containerStatus; + $this->server->save(); + return; + } + if ((is_null($containerStatus) ||$containerStatus !== 'running' || $databaseContainerStatus !== 'running' || ($containerStatus && $databaseContainerStatus !== $containerStatus)) && $this->server->isProxyShouldRun()) { + $this->server->proxy->status = $containerStatus; + $this->server->save(); + resolve(StartProxy::class)($this->server); + return; } - $this->server->save(); } } catch (\Throwable $e) { if ($e->getCode() === 1) { diff --git a/app/Jobs/ProxyStartJob.php b/app/Jobs/ProxyStartJob.php deleted file mode 100755 index 90230ccbf..000000000 --- a/app/Jobs/ProxyStartJob.php +++ /dev/null @@ -1,44 +0,0 @@ -server->name); - $status = getContainerStatus(server: $this->server, container_id: $container_name); - if ($status === 'running') { - return; - } - if (is_null(data_get($this->server, 'proxy.type'))) { - $this->server->proxy->type = ProxyTypes::TRAEFIK_V2->value; - $this->server->proxy->status = ProxyStatus::EXITED->value; - $this->server->save(); - } - resolve(StartProxy::class)($this->server); - } catch (\Throwable $e) { - send_internal_notification('ProxyStartJob failed with: ' . $e->getMessage()); - ray($e->getMessage()); - throw $e; - } - } -} diff --git a/app/Jobs/ResourceStatusJob.php b/app/Jobs/ResourceStatusJob.php deleted file mode 100644 index 3e5f5a455..000000000 --- a/app/Jobs/ResourceStatusJob.php +++ /dev/null @@ -1,46 +0,0 @@ -applications = Application::all(); - $this->postgresqls = StandalonePostgresql::all(); - } - - public function handle(): void - { - try { - foreach ($this->applications as $application) { - dispatch(new ApplicationContainerStatusJob( - application: $application, - )); - } - foreach ($this->postgresqls as $postgresql) { - dispatch(new DatabaseContainerStatusJob( - database: $postgresql, - )); - } - } catch (\Throwable $e) { - send_internal_notification('ResourceStatusJob failed with: ' . $e->getMessage()); - ray($e); - throw $e; - } - } -} diff --git a/app/Models/Server.php b/app/Models/Server.php index f3d9090a0..973d2d628 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -30,7 +30,6 @@ protected static function booted() 'server_id' => $server->id, ]); } - }); static::deleting(function ($server) { $server->destinations()->each(function ($destination) { @@ -72,7 +71,6 @@ static public function destinationsByServer(string $server_id) $swarmDocker = collect($server->swarmDockers->all()); return $standaloneDocker->concat($swarmDocker); } - public function settings() { return $this->hasOne(ServerSetting::class); @@ -93,7 +91,8 @@ public function isEmpty() return false; } - public function databases() { + public function databases() + { return $this->destinations()->map(function ($standaloneDocker) { $postgresqls = $standaloneDocker->postgresqls; return $postgresqls?->concat([]) ?? collect([]); @@ -137,4 +136,21 @@ public function team() { return $this->belongsTo(Team::class); } + public function isProxyShouldRun() + { + $shouldRun = false; + foreach ($this->applications() as $application) { + if (data_get($application, 'fqdn')) { + $shouldRun = true; + break; + } + } + if ($this->id === 0) { + $settings = InstanceSettings::get(); + if (data_get($settings, 'fqdn')) { + $shouldRun = true; + } + } + return $shouldRun; + } } diff --git a/app/View/Components/Modal.php b/app/View/Components/Modal.php index d37e10dca..e38d2dfb1 100644 --- a/app/View/Components/Modal.php +++ b/app/View/Components/Modal.php @@ -13,9 +13,10 @@ class Modal extends Component */ public function __construct( public string $modalId, - public string|null $modalTitle = null, - public string|null $modalBody = null, - public string|null $modalSubmit = null, + public ?string $submitWireAction = null, + public ?string $modalTitle = null, + public ?string $modalBody = null, + public ?string $modalSubmit = null, public bool $noSubmit = false, public bool $yesOrNo = false, public string $action = 'delete' diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php index 650903c44..d457b2651 100644 --- a/resources/views/components/modal.blade.php +++ b/resources/views/components/modal.blade.php @@ -34,7 +34,8 @@ @else
+ @if($submitWireAction) wire:submit.prevent={{$submitWireAction}} @endif + @if(!$noSubmit && !$submitWireAction) wire:submit.prevent='submit' @endif> @isset($modalTitle)

{{ $modalTitle }}

@endisset diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index de16401f0..3bba0ad3c 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -52,16 +52,15 @@ @endif @if ($server->settings->is_reachable && !$server->settings->is_usable && $server->id !== 0) - - Install Docker Engine 24.0 + + Install Docker Engine 24.0 @endif @if ($server->settings->is_usable)

Settings

-
-
@endif

Danger Zone

diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index 386b07370..abfb7f69f 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -1,7 +1,17 @@
- @if ($server->settings->is_usable) - @if ($server->proxy->type) -
+ @if (data_get($server,'settings.is_usable')) + @if (data_get($server,'proxy.type')) + + + + + + + Close + + + +
@if ($selectedProxy === 'TRAEFIK_V2')
@@ -19,15 +29,12 @@ configurations.
@endif -
- -
-
+
-
+
@if ($proxy_settings)
- - -

This will start the proxy on this server and - . -
Please think - again. -

- - - @if (data_get($server, 'proxy.type')) + @if (is_null(data_get($server, 'proxy.type')) || data_get($server, 'proxy.type') !== 'NONE') @if (data_get($server, 'proxy.status') === 'running')
@else - + @endif @endif
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php index 9a024135e..3aec00746 100644 --- a/resources/views/livewire/server/proxy/status.blade.php +++ b/resources/views/livewire/server/proxy/status.blade.php @@ -1,4 +1,4 @@ -
+
@if ($server->proxy->status === 'running') @elseif ($server->proxy->status === 'restarting') @@ -6,4 +6,13 @@ @else @endif +