Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

fix(sentinel): prevent restart after Sentinel is disabled (#11298)

Andras Bacsai81ed9a3af21b
diff --git a/app/Jobs/CheckAndStartSentinelJob.php b/app/Jobs/CheckAndStartSentinelJob.php
index 304b2a15c4..5bfe5d504a 100644
--- a/app/Jobs/CheckAndStartSentinelJob.php
+++ b/app/Jobs/CheckAndStartSentinelJob.php
@@ -21,6 +21,10 @@ class CheckAndStartSentinelJob implements ShouldBeEncrypted, ShouldQueue
public function handle(): void
{
+ if (! $this->sentinelIsEnabled()) {
+ return;
+ }
+
$latestVersion = get_latest_sentinel_version();
// Check if sentinel is running
@@ -28,7 +32,7 @@ class CheckAndStartSentinelJob implements ShouldBeEncrypted, ShouldQueue
$sentinelFoundJson = json_decode($sentinelFound, true);
$sentinelStatus = data_get($sentinelFoundJson, '0.State.Status', 'exited');
if ($sentinelStatus !== 'running') {
- StartSentinel::run(server: $this->server, restart: true, latestVersion: $latestVersion);
+ $this->startSentinel($latestVersion);
return;
}
@@ -38,15 +42,31 @@ class CheckAndStartSentinelJob implements ShouldBeEncrypted, ShouldQueue
$runningVersion = '0.0.0';
}
if ($latestVersion === '0.0.0' && $runningVersion === '0.0.0') {
- StartSentinel::run(server: $this->server, restart: true, latestVersion: 'latest');
+ $this->startSentinel('latest');
return;
} else {
if (version_compare($runningVersion, $latestVersion, '<')) {
- StartSentinel::run(server: $this->server, restart: true, latestVersion: $latestVersion);
+ $this->startSentinel($latestVersion);
return;
}
}
}
+
+ private function sentinelIsEnabled(): bool
+ {
+ $this->server->unsetRelation('settings');
+
+ return $this->server->isSentinelEnabled();
+ }
+
+ private function startSentinel(string $latestVersion): void
+ {
+ if (! $this->sentinelIsEnabled()) {
+ return;
+ }
+
+ StartSentinel::run(server: $this->server, restart: true, latestVersion: $latestVersion);
+ }
}
diff --git a/tests/Feature/Jobs/CheckAndStartSentinelJobTest.php b/tests/Feature/Jobs/CheckAndStartSentinelJobTest.php
new file mode 100644
index 0000000000..53d277f52f
--- /dev/null
+++ b/tests/Feature/Jobs/CheckAndStartSentinelJobTest.php
@@ -0,0 +1,25 @@
+<?php
+
+use App\Jobs\CheckAndStartSentinelJob;
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+
+uses(RefreshDatabase::class);
+
+it('does not start Sentinel after it has been disabled', function () {
+ DB::table('instance_settings')->insert(['id' => 0]);
+ $user = User::factory()->create();
+ $server = Server::factory()->create([
+ 'team_id' => $user->teams()->first()->id,
+ ]);
+ $server->settings->update([
+ 'is_metrics_enabled' => false,
+ 'is_sentinel_enabled' => false,
+ ]);
+
+ (new CheckAndStartSentinelJob($server))->handle();
+
+ expect((bool) $server->settings->fresh()->is_sentinel_enabled)->toBeFalse();
+});