dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactor StartSentinel.php to use data_get() for retrieving server settings

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-15 15:45:02 +02:00
parent 46ec8eed64
commit 8c53af088e
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Actions/Server/StartSentinel.php
View File

@@ -15,21 +15,16 @@ class StartSentinel
if ($restart) { if ($restart) {
StopSentinel::run($server); StopSentinel::run($server);
} }
$metrics_history = $server->settings->sentinel_metrics_history_days; $metrics_history = data_get($server, 'settings.sentinel_metrics_history_days');
$refresh_rate = $server->settings->sentinel_metrics_refresh_rate_seconds; $refresh_rate = data_get($server, 'settings.sentinel_metrics_refresh_rate_seconds');
$push_interval = $server->settings->sentinel_push_interval_seconds; $push_interval = data_get($server, 'settings.sentinel_push_interval_seconds');
$token = $server->settings->sentinel_token; $token = data_get($server, 'settings.sentinel_token');
$endpoint = InstanceSettings::get()->fqdn; $endpoint = data_get($server, 'settings.sentinel_custom_url');
$mount_dir = '/data/coolify/sentinel'; $mount_dir = '/data/coolify/sentinel';
$image = "ghcr.io/coollabsio/sentinel:$version"; $image = "ghcr.io/coollabsio/sentinel:$version";
if ($server->isLocalhost()) {
$endpoint = 'http://host.docker.internal:8000';
} else {
if (! $endpoint) { if (! $endpoint) {
throw new \Exception('You should set FQDN in Instance Settings.'); throw new \Exception('You should set FQDN in Instance Settings.');
} }
}
$environments = [ $environments = [
'TOKEN' => $token, 'TOKEN' => $token,
'PUSH_ENDPOINT' => $endpoint, 'PUSH_ENDPOINT' => $endpoint,

6
app/Models/Server.php
View File

@@ -529,17 +529,17 @@ $schema://$host {
public function generateSentinelUrl() { public function generateSentinelUrl() {
if ($this->isLocalhost()) { if ($this->isLocalhost()) {
return 'http://host.docker.internal:8888'; return 'http://host.docker.internal:8000';
} }
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
if ($settings->fqdn) { if ($settings->fqdn) {
return $settings->fqdn; return $settings->fqdn;
} }
if ($settings->ipv4) { if ($settings->ipv4) {
return $settings->ipv4 . ':8888'; return $settings->ipv4 . ':8000';
} }
if ($settings->ipv6) { if ($settings->ipv6) {
return $settings->ipv6 . ':8888'; return $settings->ipv6 . ':8000';
} }
return null; return null;
} }