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

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

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

6
app/Models/Server.php
View File

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