StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correctly reset a schedule if there is an exception during the run stage; closes #2550

Browse source
This commit is contained in:
Dane Everitt 2020-10-26 20:54:15 -07:00
parent bffec5b3dc
commit 73b795faba
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 71 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/Services/Schedules/ProcessScheduleService.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Services\Schedules;
use Exception;
use Pterodactyl\Models\Schedule;
use Illuminate\Contracts\Bus\Dispatcher;
use Pterodactyl\Jobs\Schedule\RunTaskJob;
@ -60,8 +61,22 @@ class ProcessScheduleService
$task->update(['is_queued' => true]);
});
$this->dispatcher->{$now ? 'dispatchNow' : 'dispatch'}(
(new RunTaskJob($task))->delay($task->time_offset)
);
$job = new RunTaskJob($task);
if (! $now) {
$this->dispatcher->dispatch($job->delay($task->time_offset));
} else {
// When using dispatchNow the RunTaskJob::failed() function is not called automatically
// so we need to manually trigger it and then continue with the exception throw.
//
// @see https://github.com/pterodactyl/panel/issues/2550
try {
$this->dispatcher->dispatchNow($job);
} catch (Exception $exception) {
$job->failed($exception);
throw $exception;
}
}
}
}