chore: prepare for PR
This commit is contained in:
parent
4ec32290cf
commit
a34d1656f4
3 changed files with 46 additions and 1 deletions
|
|
@ -15,6 +15,7 @@
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
use Illuminate\Queue\Middleware\WithoutOverlapping;
|
use Illuminate\Queue\Middleware\WithoutOverlapping;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
|
class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
|
||||||
{
|
{
|
||||||
|
|
@ -33,6 +34,19 @@ public function middleware(): array
|
||||||
|
|
||||||
public function __construct(public Server $server) {}
|
public function __construct(public Server $server) {}
|
||||||
|
|
||||||
|
public function failed(?\Throwable $exception): void
|
||||||
|
{
|
||||||
|
if ($exception instanceof \Illuminate\Queue\TimeoutExceededException) {
|
||||||
|
Log::warning('ServerCheckJob timed out', [
|
||||||
|
'server_id' => $this->server->id,
|
||||||
|
'server_name' => $this->server->name,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Delete the queue job so it doesn't appear in Horizon's failed list.
|
||||||
|
$this->job?->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,24 @@ public function handle()
|
||||||
'is_usable' => false,
|
'is_usable' => false,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
throw $e;
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function failed(?\Throwable $exception): void
|
||||||
|
{
|
||||||
|
if ($exception instanceof \Illuminate\Queue\TimeoutExceededException) {
|
||||||
|
Log::warning('ServerConnectionCheckJob timed out', [
|
||||||
|
'server_id' => $this->server->id,
|
||||||
|
'server_name' => $this->server->name,
|
||||||
|
]);
|
||||||
|
$this->server->settings->update([
|
||||||
|
'is_reachable' => false,
|
||||||
|
'is_usable' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Delete the queue job so it doesn't appear in Horizon's failed list.
|
||||||
|
$this->job?->delete();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
use Illuminate\Foundation\Bus\Dispatchable;
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\RateLimiter;
|
use Illuminate\Support\Facades\RateLimiter;
|
||||||
use Laravel\Horizon\Contracts\Silenced;
|
use Laravel\Horizon\Contracts\Silenced;
|
||||||
|
|
||||||
|
|
@ -28,6 +29,19 @@ public function backoff(): int
|
||||||
|
|
||||||
public function __construct(public Server $server, public int|string|null $percentage = null) {}
|
public function __construct(public Server $server, public int|string|null $percentage = null) {}
|
||||||
|
|
||||||
|
public function failed(?\Throwable $exception): void
|
||||||
|
{
|
||||||
|
if ($exception instanceof \Illuminate\Queue\TimeoutExceededException) {
|
||||||
|
Log::warning('ServerStorageCheckJob timed out', [
|
||||||
|
'server_id' => $this->server->id,
|
||||||
|
'server_name' => $this->server->name,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Delete the queue job so it doesn't appear in Horizon's failed list.
|
||||||
|
$this->job?->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue