From ce15f8f1ddca08c583046141c4a27638a9932814 Mon Sep 17 00:00:00 2001 From: andrasbacsai Date: Tue, 18 Jun 2024 14:43:18 +0000 Subject: [PATCH] Fix styling --- app/Jobs/PullSentinelImageJob.php | 5 ++- app/Jobs/ServerStatusJob.php | 6 +-- app/Livewire/Charts/ServerCpu.php | 1 + app/Livewire/Charts/ServerMemory.php | 6 ++- app/Livewire/Server/Form.php | 4 +- app/Models/Server.php | 38 ++++++++++--------- bootstrap/helpers/shared.php | 5 ++- .../2024_06_18_105948_move_server_metrics.php | 1 - 8 files changed, 39 insertions(+), 27 deletions(-) diff --git a/app/Jobs/PullSentinelImageJob.php b/app/Jobs/PullSentinelImageJob.php index 20fe19e99..1dd4b1dd3 100644 --- a/app/Jobs/PullSentinelImageJob.php +++ b/app/Jobs/PullSentinelImageJob.php @@ -36,7 +36,7 @@ class PullSentinelImageJob implements ShouldBeEncrypted, ShouldQueue { try { $version = get_latest_sentinel_version(); - if (!$version) { + if (! $version) { ray('Failed to get latest Sentinel version'); return; @@ -47,11 +47,12 @@ class PullSentinelImageJob implements ShouldBeEncrypted, ShouldQueue } if (version_compare($local_version, $version, '<')) { StartSentinel::run($this->server, $version, true); + return; } ray('Sentinel image is up to date'); } catch (\Throwable $e) { - send_internal_notification('PullSentinelImageJob failed with: ' . $e->getMessage()); + send_internal_notification('PullSentinelImageJob failed with: '.$e->getMessage()); ray($e->getMessage()); throw $e; } diff --git a/app/Jobs/ServerStatusJob.php b/app/Jobs/ServerStatusJob.php index ce8864304..544f0ef3b 100644 --- a/app/Jobs/ServerStatusJob.php +++ b/app/Jobs/ServerStatusJob.php @@ -41,7 +41,7 @@ class ServerStatusJob implements ShouldBeEncrypted, ShouldQueue public function handle() { - if (!$this->server->isServerReady($this->tries)) { + if (! $this->server->isServerReady($this->tries)) { throw new \RuntimeException('Server is not ready.'); } try { @@ -53,7 +53,7 @@ class ServerStatusJob implements ShouldBeEncrypted, ShouldQueue } } } catch (\Throwable $e) { - send_internal_notification('ServerStatusJob failed with: ' . $e->getMessage()); + send_internal_notification('ServerStatusJob failed with: '.$e->getMessage()); ray($e->getMessage()); return handleError($e); @@ -103,7 +103,7 @@ class ServerStatusJob implements ShouldBeEncrypted, ShouldQueue { // This will remote the coolify.yaml file from the server as it is not needed on cloud servers if (isCloud() && $this->server->id !== 0) { - $file = $this->server->proxyPath() . '/dynamic/coolify.yaml'; + $file = $this->server->proxyPath().'/dynamic/coolify.yaml'; return instant_remote_process([ "rm -f $file", diff --git a/app/Livewire/Charts/ServerCpu.php b/app/Livewire/Charts/ServerCpu.php index fda2c5227..454f59193 100644 --- a/app/Livewire/Charts/ServerCpu.php +++ b/app/Livewire/Charts/ServerCpu.php @@ -41,6 +41,7 @@ class ServerCpu extends Component return handleError($e, $this); } } + public function setInterval() { $this->loadData(); diff --git a/app/Livewire/Charts/ServerMemory.php b/app/Livewire/Charts/ServerMemory.php index 366c87838..f3f992e97 100644 --- a/app/Livewire/Charts/ServerMemory.php +++ b/app/Livewire/Charts/ServerMemory.php @@ -14,12 +14,14 @@ class ServerMemory extends Component public $data; public $categories; + public $interval = 5; public function render() { return view('livewire.charts.server-memory'); } + public function mount() { $this->loadData(); @@ -39,7 +41,9 @@ class ServerMemory extends Component return handleError($e, $this); } } - public function setInterval() { + + public function setInterval() + { $this->loadData(); } } diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php index 7622a7b96..87c0d09d1 100644 --- a/app/Livewire/Server/Form.php +++ b/app/Livewire/Server/Form.php @@ -104,7 +104,9 @@ class Form extends Component return handleError($e, $this); } } - public function restartSentinel() { + + public function restartSentinel() + { try { $version = get_latest_sentinel_version(); StartSentinel::run($this->server, $version, true); diff --git a/app/Models/Server.php b/app/Models/Server.php index 4337ce09e..744b383b5 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -131,7 +131,7 @@ class Server extends BaseModel public function setupDefault404Redirect() { - $dynamic_conf_path = $this->proxyPath() . '/dynamic'; + $dynamic_conf_path = $this->proxyPath().'/dynamic'; $proxy_type = $this->proxyType(); $redirect_url = $this->proxy->redirect_url; if ($proxy_type === 'TRAEFIK_V2') { @@ -145,8 +145,8 @@ class Server extends BaseModel respond 404 }'; $conf = - "# This file is automatically generated by Coolify.\n" . - "# Do not edit it manually (only if you know what are you doing).\n\n" . + "# This file is automatically generated by Coolify.\n". + "# Do not edit it manually (only if you know what are you doing).\n\n". $conf; $base64 = base64_encode($conf); instant_remote_process([ @@ -205,8 +205,8 @@ respond 404 ]; $conf = Yaml::dump($dynamic_conf, 12, 2); $conf = - "# This file is automatically generated by Coolify.\n" . - "# Do not edit it manually (only if you know what are you doing).\n\n" . + "# This file is automatically generated by Coolify.\n". + "# Do not edit it manually (only if you know what are you doing).\n\n". $conf; $base64 = base64_encode($conf); @@ -215,8 +215,8 @@ respond 404 redir $redirect_url }"; $conf = - "# This file is automatically generated by Coolify.\n" . - "# Do not edit it manually (only if you know what are you doing).\n\n" . + "# This file is automatically generated by Coolify.\n". + "# Do not edit it manually (only if you know what are you doing).\n\n". $conf; $base64 = base64_encode($conf); } @@ -237,7 +237,7 @@ respond 404 public function setupDynamicProxyConfiguration() { $settings = InstanceSettings::get(); - $dynamic_config_path = $this->proxyPath() . '/dynamic'; + $dynamic_config_path = $this->proxyPath().'/dynamic'; if ($this->proxyType() === 'TRAEFIK_V2') { $file = "$dynamic_config_path/coolify.yaml"; if (empty($settings->fqdn) || (isCloud() && $this->id !== 0)) { @@ -330,8 +330,8 @@ respond 404 } $yaml = Yaml::dump($traefik_dynamic_conf, 12, 2); $yaml = - "# This file is automatically generated by Coolify.\n" . - "# Do not edit it manually (only if you know what are you doing).\n\n" . + "# This file is automatically generated by Coolify.\n". + "# Do not edit it manually (only if you know what are you doing).\n\n". $yaml; $base64 = base64_encode($yaml); @@ -389,9 +389,9 @@ $schema://$host { if ($proxyType === ProxyTypes::TRAEFIK_V2->value) { $proxy_path = $proxy_path; } elseif ($proxyType === ProxyTypes::CADDY->value) { - $proxy_path = $proxy_path . '/caddy'; + $proxy_path = $proxy_path.'/caddy'; } elseif ($proxyType === ProxyTypes::NGINX->value) { - $proxy_path = $proxy_path . '/nginx'; + $proxy_path = $proxy_path.'/nginx'; } return $proxy_path; @@ -466,6 +466,7 @@ $schema://$host { { return $this->settings->is_metrics_enabled; } + public function checkSentinel() { ray("Checking sentinel on server: {$this->name}"); @@ -507,6 +508,7 @@ $schema://$host { return $parsedCollection; } } + public function getMemoryMetrics(int $mins = 5) { if ($this->isMetricsEnabled()) { @@ -646,7 +648,7 @@ $schema://$host { $containers = instant_remote_process(["docker service inspect $(docker service ls -q) --format '{{json .}}'"], $this, false); } else { $containers = instant_remote_process(['docker container ls -q'], $this, false); - if (!$containers) { + if (! $containers) { return collect([]); } $containers = instant_remote_process(["docker container inspect $(docker container ls -q) --format '{{json .}}'"], $this, false); @@ -666,7 +668,7 @@ $schema://$host { $containers = format_docker_command_output_to_json($containers); $containers = $containers->map(function ($container) { $labels = data_get($container, 'Labels'); - if (!str($labels)->contains('coolify.managed')) { + if (! str($labels)->contains('coolify.managed')) { return $container; } @@ -738,7 +740,7 @@ $schema://$host { return $this->previews()->filter(function ($preview) { $applicationId = data_get($preview, 'application_id'); $application = Application::find($applicationId); - if (!$application) { + if (! $application) { return false; } @@ -822,9 +824,9 @@ $schema://$host { public function isFunctional() { - $isFunctional = $this->settings->is_reachable && $this->settings->is_usable && !$this->settings->force_disabled; + $isFunctional = $this->settings->is_reachable && $this->settings->is_usable && ! $this->settings->force_disabled; ['private_key_filename' => $private_key_filename, 'mux_filename' => $mux_filename] = server_ssh_configuration($this); - if (!$isFunctional) { + if (! $isFunctional) { Storage::disk('ssh-keys')->delete($private_key_filename); Storage::disk('ssh-mux')->delete($mux_filename); } @@ -883,7 +885,7 @@ $schema://$host { config()->set('coolify.mux_enabled', false); $server = Server::find($this->id); - if (!$server) { + if (! $server) { return ['uptime' => false, 'error' => 'Server not found.']; } if ($server->skipServer()) { diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 47ed4b9a4..3129fef90 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -163,6 +163,7 @@ function get_latest_sentinel_version(): string try { $response = Http::get('https://cdn.coollabs.io/coolify/versions.json'); $versions = $response->json(); + return data_get($versions, 'coolify.sentinel.version'); } catch (\Throwable $e) { //throw $e; @@ -2285,7 +2286,9 @@ function isAnyDeploymentInprogress() exit(0); } -function generateSentinelToken() { +function generateSentinelToken() +{ $token = Str::random(64); + return $token; } diff --git a/database/migrations/2024_06_18_105948_move_server_metrics.php b/database/migrations/2024_06_18_105948_move_server_metrics.php index c8cbb3f6f..26a1d1684 100644 --- a/database/migrations/2024_06_18_105948_move_server_metrics.php +++ b/database/migrations/2024_06_18_105948_move_server_metrics.php @@ -1,6 +1,5 @@