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

Merge pull request #1545 from coollabsio/next

Browse Source 
v4.0.0-beta.163
This commit is contained in:
Andras Bacsai
2023-12-14 15:41:16 +01:00
committed by GitHub
parent 2c17e431ac 549446abdf
commit 03420076c9
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/CheckLogDrainContainerJob.php
View File

@@ -44,7 +44,7 @@ class CheckLogDrainContainerJob implements ShouldQueue, ShouldBeEncrypted
{ {
// ray("checking log drain statuses for {$this->server->id}"); // ray("checking log drain statuses for {$this->server->id}");
try { try {
if (!$this->server->isServerReady()) { if (!$this->server->isFunctional()) {
return; return;
}; };
$containers = instant_remote_process(["docker container ls -q"], $this->server, false); $containers = instant_remote_process(["docker container ls -q"], $this->server, false);

2
app/Jobs/ServerStatusJob.php
View File

@@ -34,7 +34,7 @@ class ServerStatusJob implements ShouldQueue, ShouldBeEncrypted
{ {
ray("checking server status for {$this->server->id}"); ray("checking server status for {$this->server->id}");
try { try {
if ($this->server->isServerReady()) { if ($this->server->isFunctional()) {
$this->cleanup(notify: false); $this->cleanup(notify: false);
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {

6
app/Models/Server.php
View File

@@ -153,13 +153,13 @@ class Server extends BaseModel
public function isServerReady() public function isServerReady()
{ {
$serverUptimeCheckNumber = $this->unreachable_count; $serverUptimeCheckNumber = $this->unreachable_count;
$serverUptimeCheckNumberMax = 3; $serverUptimeCheckNumberMax = 12;
$currentTime = now()->timestamp; $currentTime = now()->timestamp;
$runtime = 30; $runtime = 65;
$isReady = false; $isReady = false;
// Run for 30 seconds max and check every 5 seconds for 3 times // Run for 65 seconds max and check every 5 seconds for 12 times
while ($currentTime + $runtime > now()->timestamp) { while ($currentTime + $runtime > now()->timestamp) {
if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) { if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
if ($this->unreachable_notification_sent === false) { if ($this->unreachable_notification_sent === false) {

3
bootstrap/helpers/shared.php
View File

@@ -1544,6 +1544,9 @@ function generateEnvValue(string $command)
case 'USER': case 'USER':
$generatedValue = Str::random(16); $generatedValue = Str::random(16);
break; break;
default:
$generatedValue = Str::random(16);
break;
} }
return $generatedValue; return $generatedValue;
} }

2
config/sentry.php
View File

@@ -7,7 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.162', 'release' => '4.0.0-beta.163',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
config/version.php
View File

@@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.162'; return '4.0.0-beta.163';

2
versions.json
View File

@@ -4,7 +4,7 @@
"version": "3.12.36" "version": "3.12.36"
}, },
"v4": { "v4": {
"version": "4.0.0-beta.162" "version": "4.0.0-beta.163"
} }
} }
} }