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(push-server): track last_online_at and reset database restart state

Andras Bacsai458f048c4e8a
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index 5e598cecd9..b1a12ae2a3 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -307,6 +307,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
$application->status = $aggregatedStatus;
$application->save();
+ } elseif ($aggregatedStatus) {
+ $application->update(['last_online_at' => now()]);
}
continue;
@@ -321,6 +323,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
if ($aggregatedStatus && $application->status !== $aggregatedStatus) {
$application->status = $aggregatedStatus;
$application->save();
+ } elseif ($aggregatedStatus) {
+ $application->update(['last_online_at' => now()]);
}
}
}
@@ -371,6 +375,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
if ($aggregatedStatus && $subResource->status !== $aggregatedStatus) {
$subResource->status = $aggregatedStatus;
$subResource->save();
+ } elseif ($aggregatedStatus) {
+ $subResource->update(['last_online_at' => now()]);
}
continue;
@@ -386,6 +392,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
if ($aggregatedStatus && $subResource->status !== $aggregatedStatus) {
$subResource->status = $aggregatedStatus;
$subResource->save();
+ } elseif ($aggregatedStatus) {
+ $subResource->update(['last_online_at' => now()]);
}
}
}
@@ -415,6 +423,8 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
if ($application->status !== $containerStatus) {
$application->status = $containerStatus;
$application->save();
+ } else {
+ $application->update(['last_online_at' => now()]);
}
}
@@ -549,8 +559,12 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
$database = $this->databases->where('uuid', $databaseUuid)->first();
if ($database) {
if (! str($database->status)->startsWith('exited')) {
- $database->status = 'exited';
- $database->save();
+ $database->update([
+ 'status' => 'exited',
+ 'restart_count' => 0,
+ 'last_restart_at' => null,
+ 'last_restart_type' => null,
+ ]);
}
if ($database->is_public) {
StopDatabaseProxy::dispatch($database);
@@ -559,31 +573,6 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue, Silenced
});
}
- private function updateServiceSubStatus(string $serviceId, string $subType, string $subId, string $containerStatus)
- {
- $service = $this->services->where('id', $serviceId)->first();
- if (! $service) {
- return;
- }
- if ($subType === 'application') {
- $application = $service->applications->where('id', $subId)->first();
- if ($application) {
- if ($application->status !== $containerStatus) {
- $application->status = $containerStatus;
- $application->save();
- }
- }
- } elseif ($subType === 'database') {
- $database = $service->databases->where('id', $subId)->first();
- if ($database) {
- if ($database->status !== $containerStatus) {
- $database->status = $containerStatus;
- $database->save();
- }
- }
- }
- }
-
private function updateNotFoundServiceStatus()
{
$notFoundServiceApplicationIds = $this->allServiceApplicationIds->diff($this->foundServiceApplicationIds);