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

fix: start sentinel on seeder

Browse Source
This commit is contained in:
Andras Bacsai
2024-11-08 10:39:02 +01:00
parent 9d9ac5943e
commit aa1e80ccae
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/ServerSetting.php
View File

@@ -64,10 +64,10 @@ class ServerSetting extends Model
static::creating(function ($setting) { static::creating(function ($setting) {
try { try {
if (str($setting->sentinel_token)->isEmpty()) { if (str($setting->sentinel_token)->isEmpty()) {
$setting->generateSentinelToken(save: false, shouldExecuteEvent: false); $setting->generateSentinelToken(save: false, ignoreEvent: true);
} }
if (str($setting->sentinel_custom_url)->isEmpty()) { if (str($setting->sentinel_custom_url)->isEmpty()) {
$setting->generateSentinelUrl(save: false, shouldExecuteEvent: false); $setting->generateSentinelUrl(save: false, ignoreEvent: true);
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
Log::error('Error creating server setting: '.$e->getMessage()); Log::error('Error creating server setting: '.$e->getMessage());
@@ -89,7 +89,7 @@ class ServerSetting extends Model
}); });
} }
public function generateSentinelToken(bool $save = true, bool $shouldExecuteEvent = true) public function generateSentinelToken(bool $save = true, bool $ignoreEvent = false)
{ {
$data = [ $data = [
'server_uuid' => $this->server->uuid, 'server_uuid' => $this->server->uuid,
@@ -98,7 +98,7 @@ class ServerSetting extends Model
$encrypted = encrypt($token); $encrypted = encrypt($token);
$this->sentinel_token = $encrypted; $this->sentinel_token = $encrypted;
if ($save) { if ($save) {
if ($shouldExecuteEvent) { if ($ignoreEvent) {
$this->saveQuietly(); $this->saveQuietly();
} else { } else {
$this->save(); $this->save();
@@ -108,7 +108,7 @@ class ServerSetting extends Model
return $token; return $token;
} }
public function generateSentinelUrl(bool $save = true, bool $shouldExecuteEvent = true) public function generateSentinelUrl(bool $save = true, bool $ignoreEvent = false)
{ {
$domain = null; $domain = null;
$settings = InstanceSettings::get(); $settings = InstanceSettings::get();
@@ -123,7 +123,7 @@ class ServerSetting extends Model
} }
$this->sentinel_custom_url = $domain; $this->sentinel_custom_url = $domain;
if ($save) { if ($save) {
if ($shouldExecuteEvent) { if ($ignoreEvent) {
$this->saveQuietly(); $this->saveQuietly();
} else { } else {
$this->save(); $this->save();

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(shouldExecuteEvent: false); $server->settings->generateSentinelToken(ignoreEvent: true);
} }
if (str($server->settings->sentinel_custom_url)->isEmpty()) { if (str($server->settings->sentinel_custom_url)->isEmpty()) {
$url = $server->settings->generateSentinelUrl(shouldExecuteEvent: false); $url = $server->settings->generateSentinelUrl(ignoreEvent: true);
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();