Add internal code support for stopping tasks if server is not running or continuing through on task error
This commit is contained in:
parent
84483d36ee
commit
7a85c31553
2 changed files with 38 additions and 14 deletions
|
@ -7,8 +7,6 @@ use Pterodactyl\Jobs\Job;
|
||||||
use Carbon\CarbonImmutable;
|
use Carbon\CarbonImmutable;
|
||||||
use Pterodactyl\Models\Task;
|
use Pterodactyl\Models\Task;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use Illuminate\Http\Response;
|
|
||||||
use Pterodactyl\Models\Schedule;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
@ -79,18 +77,12 @@ class RunTaskJob extends Job implements ShouldQueue
|
||||||
throw new InvalidArgumentException('Cannot run a task that points to a non-existent action.');
|
throw new InvalidArgumentException('Cannot run a task that points to a non-existent action.');
|
||||||
}
|
}
|
||||||
} catch (Exception $exception) {
|
} catch (Exception $exception) {
|
||||||
if ($exception instanceof DaemonConnectionException) {
|
// If this isn't a DaemonConnectionException on a task that allows for failures
|
||||||
// If the task "failed" because the server is offline and it was sending a command or
|
// throw the exception back up the chain so that the task is stopped.
|
||||||
// executing a power action (which shouldn't happen?) then just stop trying to process
|
if (!($this->task->continue_on_failure && $exception instanceof DaemonConnectionException)) {
|
||||||
// the schedule, but don't actually log the failure.
|
|
||||||
if ($this->task->action === Task::ACTION_POWER || $this->task->action === Task::ACTION_COMMAND) {
|
|
||||||
// Do the thing
|
|
||||||
if ($exception->getStatusCode() === Response::HTTP_CONFLICT) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw $exception;
|
throw $exception;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->markTaskNotQueued();
|
$this->markTaskNotQueued();
|
||||||
$this->queueNextTask();
|
$this->queueNextTask();
|
||||||
|
|
|
@ -8,6 +8,8 @@ use Illuminate\Contracts\Bus\Dispatcher;
|
||||||
use Pterodactyl\Jobs\Schedule\RunTaskJob;
|
use Pterodactyl\Jobs\Schedule\RunTaskJob;
|
||||||
use Illuminate\Database\ConnectionInterface;
|
use Illuminate\Database\ConnectionInterface;
|
||||||
use Pterodactyl\Exceptions\DisplayException;
|
use Pterodactyl\Exceptions\DisplayException;
|
||||||
|
use Pterodactyl\Repositories\Wings\DaemonServerRepository;
|
||||||
|
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
|
||||||
|
|
||||||
class ProcessScheduleService
|
class ProcessScheduleService
|
||||||
{
|
{
|
||||||
|
@ -21,13 +23,19 @@ class ProcessScheduleService
|
||||||
*/
|
*/
|
||||||
private $connection;
|
private $connection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
|
||||||
|
*/
|
||||||
|
private $serverRepository;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ProcessScheduleService constructor.
|
* ProcessScheduleService constructor.
|
||||||
*/
|
*/
|
||||||
public function __construct(ConnectionInterface $connection, Dispatcher $dispatcher)
|
public function __construct(ConnectionInterface $connection, DaemonServerRepository $serverRepository, Dispatcher $dispatcher)
|
||||||
{
|
{
|
||||||
$this->dispatcher = $dispatcher;
|
$this->dispatcher = $dispatcher;
|
||||||
$this->connection = $connection;
|
$this->connection = $connection;
|
||||||
|
$this->serverRepository = $serverRepository;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -38,7 +46,7 @@ class ProcessScheduleService
|
||||||
public function handle(Schedule $schedule, bool $now = false)
|
public function handle(Schedule $schedule, bool $now = false)
|
||||||
{
|
{
|
||||||
/** @var \Pterodactyl\Models\Task $task */
|
/** @var \Pterodactyl\Models\Task $task */
|
||||||
$task = $schedule->tasks()->orderBy('sequence_id', 'asc')->first();
|
$task = $schedule->tasks()->orderBy('sequence_id')->first();
|
||||||
|
|
||||||
if (is_null($task)) {
|
if (is_null($task)) {
|
||||||
throw new DisplayException('Cannot process schedule for task execution: no tasks are registered.');
|
throw new DisplayException('Cannot process schedule for task execution: no tasks are registered.');
|
||||||
|
@ -54,6 +62,30 @@ class ProcessScheduleService
|
||||||
});
|
});
|
||||||
|
|
||||||
$job = new RunTaskJob($task, $now);
|
$job = new RunTaskJob($task, $now);
|
||||||
|
if ($schedule->only_when_online) {
|
||||||
|
// Check that the server is currently in a starting or running state before executing
|
||||||
|
// this schedule if this option has been set.
|
||||||
|
try {
|
||||||
|
$details = $this->serverRepository->setServer($schedule->server)->getDetails();
|
||||||
|
$state = $details['state'] ?? 'offline';
|
||||||
|
// If the server is stopping or offline just do nothing with this task.
|
||||||
|
if (in_array($state, ['offline', 'stopping'])) {
|
||||||
|
$job->failed();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (Exception $exception) {
|
||||||
|
if (!$exception instanceof DaemonConnectionException) {
|
||||||
|
// If we encountered some exception during this process that wasn't just an
|
||||||
|
// issue connecting to Wings run the failed sequence for a job. Otherwise we
|
||||||
|
// can just quietly mark the task as completed without actually running anything.
|
||||||
|
$job->failed($exception);
|
||||||
|
}
|
||||||
|
$job->failed();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!$now) {
|
if (!$now) {
|
||||||
$this->dispatcher->dispatch($job->delay($task->time_offset));
|
$this->dispatcher->dispatch($job->delay($task->time_offset));
|
||||||
|
|
Loading…
Reference in a new issue