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

Schedule recalculation only when another is not running or scheduled

Browse Source 
[MAILPOET-3776]
This commit is contained in:
Jan Lysý
2021-09-01 13:26:28 +02:00
committed by Veljko V
parent aec9ecbcde
commit 00bd5e2e7d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Cron/Workers/SubscribersCountCacheRecalculation.php
View File

@@ -5,6 +5,7 @@ namespace MailPoet\Cron\Workers;
use MailPoet\Cache\TransientCache; use MailPoet\Cache\TransientCache;
use MailPoet\Entities\SegmentEntity; use MailPoet\Entities\SegmentEntity;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Newsletter\Sending\ScheduledTasksRepository;
use MailPoet\Segments\SegmentsRepository; use MailPoet\Segments\SegmentsRepository;
use MailPoet\Subscribers\SubscribersCountsController; use MailPoet\Subscribers\SubscribersCountsController;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@@ -25,16 +26,21 @@ class SubscribersCountCacheRecalculation extends SimpleWorker {
/** @var SubscribersCountsController */ /** @var SubscribersCountsController */
private $subscribersCountsController; private $subscribersCountsController;
/** @var ScheduledTasksRepository */
private $scheduledTasksRepository;
public function __construct( public function __construct(
TransientCache $transientCache, TransientCache $transientCache,
SegmentsRepository $segmentsRepository, SegmentsRepository $segmentsRepository,
SubscribersCountsController $subscribersCountsController, SubscribersCountsController $subscribersCountsController,
ScheduledTasksRepository $scheduledTasksRepository,
WPFunctions $wp WPFunctions $wp
) { ) {
parent::__construct($wp); parent::__construct($wp);
$this->transientCache = $transientCache; $this->transientCache = $transientCache;
$this->segmentsRepository = $segmentsRepository; $this->segmentsRepository = $segmentsRepository;
$this->subscribersCountsController = $subscribersCountsController; $this->subscribersCountsController = $subscribersCountsController;
$this->scheduledTasksRepository = $scheduledTasksRepository;
} }
public function processTaskStrategy(ScheduledTask $task, $timer) { public function processTaskStrategy(ScheduledTask $task, $timer) {
@@ -73,6 +79,10 @@ class SubscribersCountCacheRecalculation extends SimpleWorker {
} }
public function shouldBeScheduled(): bool { public function shouldBeScheduled(): bool {
$scheduledOrRunningTask = $this->scheduledTasksRepository->findScheduledOrRunningTask(self::TASK_TYPE);
if ($scheduledOrRunningTask) {
return false;
}
$now = Carbon::now(); $now = Carbon::now();
$oldestCreatedAt = $this->transientCache->getOldestCreatedAt(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY); $oldestCreatedAt = $this->transientCache->getOldestCreatedAt(TransientCache::SUBSCRIBERS_STATISTICS_COUNT_KEY);
return $oldestCreatedAt === null || $now->diffInMinutes($oldestCreatedAt) > self::EXPIRATION_IN_MINUTES; return $oldestCreatedAt === null || $now->diffInMinutes($oldestCreatedAt) > self::EXPIRATION_IN_MINUTES;