mirror of
https://github.com/linuxserver/Heimdall.git
synced 2026-08-07 07:16:13 +00:00
Josh Salway
243ad00810
Both jobs implement ShouldBeUnique without a $uniqueFor value, which on
Redis and database drivers produces a lock that never expires. If the
worker is killed mid-fire (OOM, SIGKILL, server crash), the lock
persists and blocks all future dispatches of UpdateApps or ProcessApps
until the cache entry is manually cleared.
Neither job sets $tries, $backoff, or $timeout, so they inherit the
worker command's defaults (1 for queue:work, 0 for vapor:work), which
varies by platform and is brittle.
This change adds:
- $uniqueFor = 3600 lock expires after 1 hour
- $tries = 3 hard cap across worker restarts
- $backoff = [30, 60, 120] pace retries to reduce GitHub API load
- $timeout = 60 bound per-attempt wall-clock time
- failed(Throwable) log permanent failures (and preserve the
existing Cache::lock('updateApps')->forceRelease
on UpdateApps)
A new test (tests/Feature/QueueSafetyTest.php) asserts the retry
properties are present.
All existing tests still pass.
86 lines
2.2 KiB
PHP
86 lines
2.2 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Application;
|
|
use App\Item;
|
|
use App\SupportedApps;
|
|
use GuzzleHttp\Exception\GuzzleException;
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Illuminate\Support\Facades\Log;
|
|
use Illuminate\Support\Facades\Storage;
|
|
use Throwable;
|
|
|
|
class ProcessApps implements ShouldQueue, ShouldBeUnique
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
/**
|
|
* Bound total attempts so a failed job stops after three retries across
|
|
* worker restarts, independent of the broker's reserved-job recovery path.
|
|
*/
|
|
public int $tries = 3;
|
|
|
|
/** @var array<int, int> seconds between retries */
|
|
public array $backoff = [30, 60, 120];
|
|
|
|
public int $timeout = 60;
|
|
|
|
/**
|
|
* Expire the ShouldBeUnique lock after 1 hour so a crashed worker does
|
|
* not permanently block future ProcessApps dispatches.
|
|
*/
|
|
public int $uniqueFor = 3600;
|
|
|
|
/**
|
|
* Create a new job instance.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function __construct()
|
|
{
|
|
//
|
|
}
|
|
|
|
/**
|
|
* Execute the job.
|
|
*
|
|
* @throws GuzzleException
|
|
*/
|
|
public function handle(): void
|
|
{
|
|
Log::debug('Process Apps dispatched');
|
|
$localapps = Application::whereNull('class')->get();
|
|
$json = SupportedApps::getList()->getBody();
|
|
|
|
Storage::disk('local')->put('supportedapps.json', $json);
|
|
|
|
foreach ($localapps as $app) {
|
|
$app->class = $app->class();
|
|
$app->save();
|
|
}
|
|
|
|
$items = Item::whereNotNull('class')->get();
|
|
foreach ($items as $item) {
|
|
if (! file_exists(app_path('SupportedApps/'.Item::nameFromClass($item->class)))) {
|
|
$app = Application::where('class', $item->class)->first();
|
|
if ($app) {
|
|
Application::getApp($app->appid);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public function failed(Throwable $exception): void
|
|
{
|
|
Log::error(static::class . ' permanently failed', [
|
|
'exception' => $exception->getMessage(),
|
|
]);
|
|
}
|
|
}
|