Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't abort the entire schedule running process if one schedule encounters an exception; closes #2609

Browse source
This commit is contained in:
Dane Everitt 2020-10-26 20:16:39 -07:00
parent 200a78d77b
commit bffec5b3dc
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
app/Console/Commands/Schedule/ProcessRunnableCommand.php
View file

@ -2,8 +2,11 @@
namespace Pterodactyl\Console\Commands\Schedule;
use Throwable;
use Exception;
use Illuminate\Console\Command;
use Pterodactyl\Models\Schedule;
use Illuminate\Support\Facades\Log;
use Pterodactyl\Services\Schedules\ProcessScheduleService;
class ProcessRunnableCommand extends Command
@ -20,12 +23,8 @@ class ProcessRunnableCommand extends Command
/**
* Handle command execution.
*
* @param \Pterodactyl\Services\Schedules\ProcessScheduleService $service
*
* @throws \Throwable
*/
public function handle(ProcessScheduleService $service)
public function handle()
{
$schedules = Schedule::query()->with('tasks')
->where('is_active', true)
@ -41,22 +40,40 @@ class ProcessRunnableCommand extends Command
$bar = $this->output->createProgressBar(count($schedules));
foreach ($schedules as $schedule) {
if ($schedule->tasks->isNotEmpty()) {
$service->handle($schedule);
if ($this->input->isInteractive()) {
$bar->clear();
$this->line(trans('command/messages.schedule.output_line', [
'schedule' => $schedule->name,
'hash' => $schedule->hashid,
]));
}
}
$this->processSchedule($schedule);
$bar->advance();
$bar->display();
}
$this->line('');
}
/**
* Processes a given schedule and logs and errors encountered the console output. This should
* never throw an exception out, otherwise you'll end up killing the entire run group causing
* any other schedules to not process correctly.
*
* @param \Pterodactyl\Models\Schedule $schedule
* @see https://github.com/pterodactyl/panel/issues/2609
*/
protected function processSchedule(Schedule $schedule)
{
if ($schedule->tasks->isEmpty()) {
return;
}
try {
$this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);
$this->line(trans('command/messages.schedule.output_line', [
'schedule' => $schedule->name,
'hash' => $schedule->hashid,
]));
} catch (Throwable | Exception $exception) {
Log::error($exception, ['schedule_id' => $schedule->id]);
$this->error("An error was encountered while processing Schedule #{$schedule->id}: " . $exception->getMessage());
}
}
}