Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use processTaskStrategy() instead of custom logic in Migration worker

Browse Source 
[MAILPOET-2538]
This commit is contained in:
Jan Jakeš
2019-11-18 16:43:53 +01:00
committed by Jack Kitterhing
parent 8a8b34e554
commit ac794aaca2
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Cron/Workers/SendingQueue/Migration.php
View File

@ -21,7 +21,7 @@ class Migration extends SimpleWorker {
return empty($completed_tasks);
}
function prepareTask(ScheduledTask $task) {
function prepareTaskStrategy(ScheduledTask $task) {
$unmigrated_columns = $this->checkUnmigratedColumnsExist();
$unmigrated_queues_count = 0;
$unmigrated_queue_subscribers = [];
@ -43,8 +43,7 @@ class Migration extends SimpleWorker {
// pause sending while the migration is in process
$this->pauseSending();
return parent::prepareTask($task);
return true;
}
function pauseSending() {
@ -74,13 +73,10 @@ class Migration extends SimpleWorker {
}
}
function processTask(ScheduledTask $task) {
function processTaskStrategy(ScheduledTask $task) {
$this->migrateSendingQueues();
$this->migrateSubscribers();
$this->complete($task);
$this->resumeSending();
return true;
}

13
lib/Cron/Workers/SimpleWorker.php
View File

@ -93,13 +93,14 @@ abstract class SimpleWorker {
}
function prepareTask(ScheduledTask $task) {
$task->status = null;
$task->save();
// abort if execution limit is reached
$this->cron_helper->enforceExecutionLimit($this->timer);
return true;
$prepare_completed = $this->prepareTaskStrategy($task);
if ($prepare_completed) {
$task->status = null;
$task->save();
}
}
function processTask(ScheduledTask $task) {
@ -133,6 +134,10 @@ abstract class SimpleWorker {
return (bool)$completed;
}
function prepareTaskStrategy(ScheduledTask $task) {
return true;
}
function processTaskStrategy(ScheduledTask $task) {
return true;
}