Refactor logging in PushServerUpdateJob, Application, and SentinelSeeder

This commit is contained in:
Andras Bacsai
2024-10-15 17:03:50 +02:00
parent 8c53af088e
commit 2702fbc284
4 changed files with 34 additions and 29 deletions

View File

@@ -63,6 +63,7 @@ class PushServerUpdateJob implements ShouldQueue
public Collection $foundApplicationPreviewsIds;
public bool $foundProxy = false;
public bool $foundLogDrainContainer = false;
public function backoff(): int
@@ -204,7 +205,8 @@ class PushServerUpdateJob implements ShouldQueue
}
private function serverStatus(){
private function serverStatus()
{
if ($this->server->isFunctional() === false) {
throw new \Exception('Server is not ready.');
}
@@ -212,6 +214,7 @@ class PushServerUpdateJob implements ShouldQueue
throw new \Exception('Server is not reachable.');
}
}
private function updateApplicationStatus(string $applicationId, string $containerStatus)
{
$application = $this->applications->where('id', $applicationId)->first();
@@ -278,7 +281,6 @@ class PushServerUpdateJob implements ShouldQueue
StartProxy::run($this->server, false);
}
} catch (\Throwable $e) {
logger()->error($e);
}
} else {
$connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
@@ -396,7 +398,8 @@ class PushServerUpdateJob implements ShouldQueue
return str($containerStatus)->contains('running');
}
private function checkLogDrainContainer(){
private function checkLogDrainContainer()
{
if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) {
InstallLogDrain::dispatch($this->server);
}

View File

@@ -1427,9 +1427,11 @@ class Application extends BaseModel
$parsedCollection = collect($metrics)->map(function ($metric) {
return [(int) $metric['time'], (float) $metric['percent']];
});
return $parsedCollection->toArray();
}
}
public function getMemoryMetrics(int $mins = 5)
{
$server = $this->destination->server;
@@ -1455,9 +1457,9 @@ class Application extends BaseModel
}
$metrics = json_decode($metrics, true);
$parsedCollection = collect($metrics)->map(function ($metric) {
logger($metric);
return [(int) $metric['time'], (float) $metric['used']];
});
return $parsedCollection->toArray();
}
}
@@ -1492,6 +1494,7 @@ class Application extends BaseModel
return $config;
}
public function setConfig($config)
{

View File

@@ -17,7 +17,6 @@ class SentinelSeeder extends Seeder
}
if (str($server->settings->sentinel_custom_url)->isEmpty()) {
$url = $server->generateSentinelUrl();
logger()->info("Setting sentinel custom url for server {$server->id} to {$url}");
$server->settings->sentinel_custom_url = $url;
$server->settings->save();
}

View File

@@ -148,12 +148,12 @@ Route::group([
return response()->json(['message' => 'Server not found'], 404);
}
if ($server->settings->sentinel_token !== $naked_token) {
logger('Unauthorized');
return response()->json(['message' => 'Unauthorized'], 401);
}
$data = request()->all();
PushServerUpdateJob::dispatch($server, $data);
return response()->json(['message' => 'ok'], 200);
});
});