Skip to content

Commit

Permalink
Enhance orphan handling in Scheduler, update lang
Browse files Browse the repository at this point in the history
- Scheduler now includes orphaned tasks by default. Before this,
  the ::runTask() method never got to handling or logging orphaned
  tasks because of the default filtering excluding them.
- Adds exceptional log for orphaned tasks.
- Update language file to match.
  • Loading branch information
ditsuke committed Sep 7, 2021
1 parent 5034f02 commit 0fa3318
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
Expand Up @@ -41,7 +41,8 @@ class Scheduler
private const LOG_TEXT = [
Status::OK => 'COM_SCHEDULER_SCHEDULER_TASK_COMPLETE',
Status::NO_LOCK => 'COM_SCHEDULER_SCHEDULER_TASK_LOCKED',
Status::NO_RUN => 'COM_SCHEDULER_SCHEDULER_TASK_UNLOCKED'
Status::NO_RUN => 'COM_SCHEDULER_SCHEDULER_TASK_UNLOCKED',
Status::NO_ROUTINE => 'COM_SCHEDULER_SCHEDULER_TASK_ROUTINE_NA'
];

/**
Expand Down Expand Up @@ -212,8 +213,8 @@ public function fetchTasks(array $filters, array $listConfig): array
// Default to only enabled tasks
$model->setState('filter.state', 1);

// Default to excluding orphaned tasks
$model->setState('filter.orphaned', -1);
// Default to including orphaned tasks
$model->setState('filter.orphaned', 0);

$model->setState('list.ordering', 'a.next_execution');
$model->setState('list.direction', 'ASC');
Expand Down
3 changes: 2 additions & 1 deletion administrator/language/en-GB/com_scheduler.ini
Expand Up @@ -81,8 +81,9 @@ COM_SCHEDULER_ROUTINE_LOG_PREFIX="Task> "
COM_SCHEDULER_SCHEDULER="Scheduler"
COM_SCHEDULER_SCHEDULER_TASK_COMPLETE="Successfully finished task#%1$02d in %2$.2f (net %3$.2f) seconds."
COM_SCHEDULER_SCHEDULER_TASK_LOCKED="task#%1$02d is locked."
COM_SCHEDULER_SCHEDULER_TASK_ROUTINE_NA="Task#%1$02d has no corresponding plugin routine. The plugin might have been disabled or removed. Skipping execution."
COM_SCHEDULER_SCHEDULER_TASK_START="Running task#%1$02d '%2$s'."
COM_SCHEDULER_SCHEDULER_TASK_UNKNOWN_EXIT="Task#%1$d exited with code %4$d in %2$.2f (net %3$.2f) seconds."
COM_SCHEDULER_SCHEDULER_TASK_UNKNOWN_EXIT="Task#%1$02d exited with code %4$d in %2$.2f (net %3$.2f) seconds."
; Maybe not this
COM_SCHEDULER_SCHEDULER_TASK_UNLOCKED="Task#%1$02d was unlocked."
COM_SCHEDULER_SELECT_EXEC_RULE="--- Select Rule ---"
Expand Down

0 comments on commit 0fa3318

Please sign in to comment.