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

fix: seeder should not start sentinel

Browse Source
This commit is contained in:
Andras Bacsai
2024-11-08 10:28:40 +01:00
parent a2b6a61c4a
commit e7f2215652
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/ServerSetting.php
View File

@@ -89,7 +89,7 @@ class ServerSetting extends Model
}); });
} }
public function generateSentinelToken(bool $save = true) public function generateSentinelToken(bool $save = true, bool $shouldExecuteEvent = true)
{ {
$data = [ $data = [
'server_uuid' => $this->server->uuid, 'server_uuid' => $this->server->uuid,
@@ -98,13 +98,17 @@ class ServerSetting extends Model
$encrypted = encrypt($token); $encrypted = encrypt($token);
$this->sentinel_token = $encrypted; $this->sentinel_token = $encrypted;
if ($save) { if ($save) {
$this->save(); if ($shouldExecuteEvent) {
$this->saveQuietly();
} else {
$this->save();
}
} }
return $token; return $token;
} }
public function generateSentinelUrl(bool $save = true) public function generateSentinelUrl(bool $save = true, bool $shouldExecuteEvent = true)
{ {
$domain = null; $domain = null;
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
@@ -119,7 +123,11 @@ class ServerSetting extends Model
} }
$this->sentinel_custom_url = $domain; $this->sentinel_custom_url = $domain;
if ($save) { if ($save) {
$this->save(); if ($shouldExecuteEvent) {
$this->saveQuietly();
} else {
$this->save();
}
} }
return $domain; return $domain;

4
database/seeders/SentinelSeeder.php
View File

@@ -14,10 +14,10 @@ class SentinelSeeder extends Seeder
foreach ($servers as $server) { foreach ($servers as $server) {
try { try {
if (str($server->settings->sentinel_token)->isEmpty()) { if (str($server->settings->sentinel_token)->isEmpty()) {
$server->settings->generateSentinelToken(); $server->settings->generateSentinelToken(shouldExecuteEvent: false);
} }
if (str($server->settings->sentinel_custom_url)->isEmpty()) { if (str($server->settings->sentinel_custom_url)->isEmpty()) {
$url = $server->settings->generateSentinelUrl(); $url = $server->settings->generateSentinelUrl(shouldExecuteEvent: false);
if (str($url)->isEmpty()) { if (str($url)->isEmpty()) {
$server->settings->is_sentinel_enabled = false; $server->settings->is_sentinel_enabled = false;
$server->settings->save(); $server->settings->save();