3a3219394d
- Removed the private property for application deployment queue ID in ApplicationDeploymentJob and utilized constructor property promotion. - Added a tags method in ApplicationDeploymentJob to properly identify the worker running the job. - Updated HorizonServiceProvider to handle cases where the deployment queue ID is blank, preventing potential errors during job processing. - Cleaned up the isAnyDeploymentInprogress function by removing unnecessary whitespace.
64 lines
1.9 KiB
PHP
64 lines
1.9 KiB
PHP
<?php
|
|
|
|
namespace App\Providers;
|
|
|
|
use App\Contracts\CustomJobRepositoryInterface;
|
|
use App\Models\ApplicationDeploymentQueue;
|
|
use App\Models\User;
|
|
use App\Repositories\CustomJobRepository;
|
|
use Illuminate\Support\Facades\Event;
|
|
use Illuminate\Support\Facades\Gate;
|
|
use Laravel\Horizon\Contracts\JobRepository;
|
|
use Laravel\Horizon\Events\JobReserved;
|
|
use Laravel\Horizon\HorizonApplicationServiceProvider;
|
|
|
|
class HorizonServiceProvider extends HorizonApplicationServiceProvider
|
|
{
|
|
/**
|
|
* Register services.
|
|
*/
|
|
public function register(): void
|
|
{
|
|
$this->app->singleton(JobRepository::class, CustomJobRepository::class);
|
|
$this->app->singleton(CustomJobRepositoryInterface::class, CustomJobRepository::class);
|
|
}
|
|
|
|
/**
|
|
* Bootstrap services.
|
|
*/
|
|
public function boot(): void
|
|
{
|
|
parent::boot();
|
|
Event::listen(function (JobReserved $event) {
|
|
$payload = $event->payload->decoded;
|
|
$jobName = $payload['displayName'];
|
|
if ($jobName === 'App\Jobs\ApplicationDeploymentJob') {
|
|
$tags = $payload['tags'];
|
|
$id = $payload['id'];
|
|
$deploymentQueueId = collect($tags)->first(function ($tag) {
|
|
return str_contains($tag, 'App\Models\ApplicationDeploymentQueue');
|
|
});
|
|
if (blank($deploymentQueueId)) {
|
|
return;
|
|
}
|
|
$deploymentQueueId = explode(':', $deploymentQueueId)[1];
|
|
$deploymentQueue = ApplicationDeploymentQueue::find($deploymentQueueId);
|
|
$deploymentQueue->update([
|
|
'horizon_job_id' => $id,
|
|
]);
|
|
}
|
|
});
|
|
}
|
|
|
|
protected function gate(): void
|
|
{
|
|
Gate::define('viewHorizon', function ($user) {
|
|
$root_user = User::find(0);
|
|
|
|
return in_array($user->email, [
|
|
$root_user->email,
|
|
]);
|
|
});
|
|
}
|
|
}
|