RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-03 19:53:19 +03:00
Code Issues Projects Releases Wiki Activity

JobManager fix

Browse Source
This commit is contained in:
Pavel 2019-10-25 10:49:42 +03:00
parent 1e20ca316a
commit a4473d488d
1 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
retailcrm/lib/JobManager.php
View File

@ -29,7 +29,6 @@ if (!defined('_PS_VERSION_')) {
*/ */
class JobManager class JobManager
{ {
const DATE_FORMAT = 'Y.m.d H:i:s';
const LAST_RUN_NAME = 'RETAILCRM_LAST_RUN'; const LAST_RUN_NAME = 'RETAILCRM_LAST_RUN';
const IN_PROGRESS_NAME = 'RETAILCRM_JOBS_IN_PROGRESS'; const IN_PROGRESS_NAME = 'RETAILCRM_JOBS_IN_PROGRESS';
@ -59,7 +58,7 @@ class JobManager
public static function execJobs($jobs = array(), $runOnceInContext = false) public static function execJobs($jobs = array(), $runOnceInContext = false)
{ {
$current = date_create('now'); $current = date_create('now');
$lastRun = date_create_from_format(self::DATE_FORMAT, (string) Configuration::get(self::LAST_RUN_NAME)); $lastRun = date_create_from_format(DATE_RFC3339, (string) Configuration::get(self::LAST_RUN_NAME));
if ($lastRun === false) { if ($lastRun === false) {
$lastRun = $current; $lastRun = $current;
@ -69,12 +68,14 @@ class JobManager
return; return;
} }
Configuration::updateValue(self::LAST_RUN_NAME, date_format($current, self::DATE_FORMAT));
foreach ($jobs as $job => $diff) { foreach ($jobs as $job => $diff) {
try { try {
if (static::compareIntervals(date_diff($lastRun, $current), $diff, $current) == 1) { $shouldRunAt = clone $lastRun;
$shouldRunAt->add($diff);
if ($shouldRunAt <= $current) {
JobManager::runJob($job, $runOnceInContext); JobManager::runJob($job, $runOnceInContext);
Configuration::updateValue(self::LAST_RUN_NAME, date_format($current, DATE_RFC3339));
} }
} catch (\Exception $exception) { } catch (\Exception $exception) {
static::handleError($exception->getFile(), $exception->getMessage()); static::handleError($exception->getFile(), $exception->getMessage());
@ -88,33 +89,6 @@ class JobManager
static::unlock(); static::unlock();
} }
/**
* Compare two date intervals
*
* @param $first
* @param $second
* @param null $now
*
* @return int
* @throws \Exception
*/
private static function compareIntervals($first, $second, $now = null)
{
$dateFirst = is_null($now) ? new DateTime() : $now;
$dateSecond = clone $dateFirst;
$dateFirst->add($first);
$dateSecond->add($second);
if($dateFirst < $dateSecond) {
return -1;
} elseif($dateFirst == $dateSecond) {
return 0;
}
return 1;
}
/** /**
* Runs job * Runs job
* *
@ -339,7 +313,7 @@ class JobManager
private static function isLocked() private static function isLocked()
{ {
$inProcess = (bool) Configuration::get(self::IN_PROGRESS_NAME); $inProcess = (bool) Configuration::get(self::IN_PROGRESS_NAME);
$lastRan = date_create_from_format(self::DATE_FORMAT, (string) Configuration::get(self::LAST_RUN_NAME)); $lastRan = date_create_from_format(DATE_RFC3339, (string) Configuration::get(self::LAST_RUN_NAME));
$lastRanSeconds = $lastRan instanceof DateTime ? $lastRan->format('U') : time(); $lastRanSeconds = $lastRan instanceof DateTime ? $lastRan->format('U') : time();
if (($lastRanSeconds + self::getTimeLimit()) < time()) { if (($lastRanSeconds + self::getTimeLimit()) < time()) {