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

Merge SingleInstanceSimpleWorker into SimpleWorker [MAILPOET-2385]

Browse Source
This commit is contained in:
wxa
2019-09-30 08:02:09 +03:00
committed by Jack Kitterhing
parent 0805dc365f
commit 12c526e120
8 changed files with 119 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Cron/Workers/InactiveSubscribers.php
View File

@ -6,9 +6,10 @@ use MailPoet\Models\ScheduledTask;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscribers\InactiveSubscribersController;
class InactiveSubscribers extends SingleInstanceSimpleWorker {
class InactiveSubscribers extends SimpleWorker {
const TASK_TYPE = 'inactive_subscribers';
const BATCH_SIZE = 1000;
const SUPPORT_MULTIPLE_INSTANCES = false;
/** @var InactiveSubscribersController */
private $inactive_subscribers_controller;

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

@ -14,6 +14,10 @@ abstract class SimpleWorker {
const TASK_BATCH_SIZE = 5;
const AUTOMATIC_SCHEDULING = true;
const SUPPORT_MULTIPLE_INSTANCES = true;
const TASK_RUN_TIMEOUT = 120;
const TIMED_OUT_TASK_RESCHEDULE_TIMEOUT = 5;
function __construct($timer = false) {
if (static::TASK_TYPE === null) {
throw new \Exception('Constant TASK_TYPE is not defined on subclass ' . get_class($this));
@ -97,12 +101,34 @@ abstract class SimpleWorker {
// abort if execution limit is reached
CronHelper::enforceExecutionLimit($this->timer);
if ($this->processTaskStrategy($task)) {
$this->complete($task);
return true;
if (!static::SUPPORT_MULTIPLE_INSTANCES) {
if ($this->isInProgress($task)) {
return false;
}
if ($this->rescheduleOutdated($task)) {
return false;
}
$this->startProgress($task);
}
return false;
try {
$completed = $this->processTaskStrategy($task);
} catch (\Exception $e) {
if (!static::SUPPORT_MULTIPLE_INSTANCES) {
$this->stopProgress($task);
}
throw $e;
}
if ($completed) {
$this->complete($task);
}
if (!static::SUPPORT_MULTIPLE_INSTANCES) {
$this->stopProgress($task);
}
return (bool)$completed;
}
function processTaskStrategy(ScheduledTask $task) {
@ -123,6 +149,39 @@ abstract class SimpleWorker {
$task->save();
}
private function isInProgress(ScheduledTask $task) {
$meta = $task->getMeta();
if (!empty($meta['in_progress'])) {
// Do not run multiple instances of the task
return true;
}
return false;
}
private function startProgress(ScheduledTask $task) {
$task->meta = array_merge($task->getMeta(), ['in_progress' => true]);
$task->save();
}
private function stopProgress(ScheduledTask $task) {
$task->meta = array_merge($task->getMeta(), ['in_progress' => null]);
$task->save();
}
private function rescheduleOutdated(ScheduledTask $task) {
$current_time = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
$updated_at = Carbon::createFromTimestamp(strtotime($task->updated_at));
// If the task is running for too long consider it stuck and reschedule
if (!empty($task->updated_at) && $updated_at->diffInMinutes($current_time, false) > self::TASK_RUN_TIMEOUT) {
$this->stopProgress($task);
$this->reschedule($task, self::TIMED_OUT_TASK_RESCHEDULE_TIMEOUT);
return true;
}
return false;
}
static function getNextRunDate() {
$wp = new WPFunctions();
$date = Carbon::createFromTimestamp($wp->currentTime('timestamp'));

74
lib/Cron/Workers/SingleInstanceSimpleWorker.php
View File

@ -1,74 +0,0 @@
<?php
namespace MailPoet\Cron\Workers;
use Carbon\Carbon;
use MailPoet\Cron\CronHelper;
use MailPoet\Models\ScheduledTask;
use MailPoet\WP\Functions as WPFunctions;
abstract class SingleInstanceSimpleWorker extends SimpleWorker {
const TASK_RUN_TIMEOUT = 120;
const TIMED_OUT_TASK_RESCHEDULE_TIMEOUT = 5;
function processTask(ScheduledTask $task) {
// abort if execution limit is reached
CronHelper::enforceExecutionLimit($this->timer);
if ($this->isInProgress($task)) {
return false;
}
if ($this->rescheduleOutdated($task)) {
return false;
}
$this->startProgress($task);
try {
$completed = $this->processTaskStrategy($task);
} catch (\Exception $e) {
$this->stopProgress($task);
throw $e;
}
if ($completed) {
$this->complete($task);
}
$this->stopProgress($task);
return (bool)$completed;
}
private function isInProgress(ScheduledTask $task) {
$meta = $task->getMeta();
if (!empty($meta['in_progress'])) {
// Do not run multiple instances of the task
return true;
}
return false;
}
private function startProgress(ScheduledTask $task) {
$task->meta = array_merge($task->getMeta(), ['in_progress' => true]);
$task->save();
}
private function stopProgress(ScheduledTask $task) {
$task->meta = array_merge($task->getMeta(), ['in_progress' => null]);
$task->save();
}
private function rescheduleOutdated(ScheduledTask $task) {
$current_time = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
$updated_at = Carbon::createFromTimestamp(strtotime($task->updated_at));
// If the task is running for too long consider it stuck and reschedule
if (!empty($task->updated_at) && $updated_at->diffInMinutes($current_time, false) > self::TASK_RUN_TIMEOUT) {
$this->stopProgress($task);
$this->reschedule($task, self::TIMED_OUT_TASK_RESCHEDULE_TIMEOUT);
return true;
}
return false;
}
}

3
lib/Cron/Workers/WooCommerceSync.php
View File

@ -7,8 +7,9 @@ use MailPoet\Segments\WooCommerce as WooCommerceSegment;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\WP\Functions as WPFunctions;
class WooCommerceSync extends SingleInstanceSimpleWorker {
class WooCommerceSync extends SimpleWorker {
const TASK_TYPE = 'woocommerce_sync';
const SUPPORT_MULTIPLE_INSTANCES = false;
/** @var WooCommerceSegment */
private $woocommerce_segment;