Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #1564 from coollabsio/next

Browse Source 
v4.0.0-beta.172
This commit is contained in:
Andras Bacsai 2023-12-21 10:35:40 +01:00 committed by GitHub
commit ad8653f54d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/ContainerStatusJob.php
View File

@ -45,7 +45,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
public function handle() public function handle()
{ {
if (!$this->server->isServerReady($this->tries)) { if (!$this->server->isServerReady($this->tries)) {
throw new \RuntimeException('Server is not reachable.'); return 'Server is not reachable.';
}; };
try { try {
if ($this->server->isSwarm()) { if ($this->server->isSwarm()) {

12
app/Models/Server.php
View File

@ -154,17 +154,21 @@ class Server extends BaseModel
if ($this->skipServer()) { if ($this->skipServer()) {
return false; return false;
} }
$serverUptimeCheckNumber = $this->unreachable_count;
if ($this->unreachable_count < $tries) { if ($this->unreachable_count < $tries) {
$serverUptimeCheckNumber = $this->unreachable_count + 1; $serverUptimeCheckNumber = $this->unreachable_count + 1;
} }
if ($this->unreachable_count > $tries) {
$serverUptimeCheckNumber = $tries;
}
$serverUptimeCheckNumberMax = $tries; $serverUptimeCheckNumberMax = $tries;
ray('server: ' . $this->name); // ray('server: ' . $this->name);
ray('serverUptimeCheckNumber: ' . $serverUptimeCheckNumber); // ray('serverUptimeCheckNumber: ' . $serverUptimeCheckNumber);
ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax); // ray('serverUptimeCheckNumberMax: ' . $serverUptimeCheckNumberMax);
$result = $this->validateConnection(); $result = $this->validateConnection();
ray($result);
if ($result) { if ($result) {
if ($this->unreachable_notification_sent === true) { if ($this->unreachable_notification_sent === true) {
$this->update(['unreachable_notification_sent' => false]); $this->update(['unreachable_notification_sent' => false]);

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.171', 'release' => '4.0.0-beta.172',
// 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.171'; return '4.0.0-beta.172';

2
versions.json
View File

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