Commit ea25ab41 authored by Carsten  Rose's avatar Carsten Rose

Merge branch 'b10919AutoCronMissingFillStoreSystemBySql' into 'develop'

Fixes #10919. fillStoreSystemBySql() will now be called after initialisation.

See merge request !275
parents b97160a9 aba029f4
Pipeline #3677 passed with stages
in 4 minutes and 8 seconds
...@@ -50,6 +50,7 @@ class AutoCron { ...@@ -50,6 +50,7 @@ class AutoCron {
/** /**
* AutoCron constructor. * AutoCron constructor.
*
* @param bool $verbose * @param bool $verbose
* @param bool $phpUnit * @param bool $phpUnit
* @throws \CodeException * @throws \CodeException
...@@ -68,6 +69,7 @@ class AutoCron { ...@@ -68,6 +69,7 @@ class AutoCron {
// set_error_handler("\\IMATHUZH\\Qfq\\Core\\Exception\\ErrorHandler::exception_error_handler"); // set_error_handler("\\IMATHUZH\\Qfq\\Core\\Exception\\ErrorHandler::exception_error_handler");
$this->store = Store::getInstance(); $this->store = Store::getInstance();
$this->store->FillStoreSystemBySql(); // Do this after the DB-update
// Set Log Mode for AutoCron updates // Set Log Mode for AutoCron updates
$sqlLogMode = $this->store->getVar(SYSTEM_SQL_LOG_MODE_AUTOCRON, STORE_SYSTEM); $sqlLogMode = $this->store->getVar(SYSTEM_SQL_LOG_MODE_AUTOCRON, STORE_SYSTEM);
...@@ -81,7 +83,7 @@ class AutoCron { ...@@ -81,7 +83,7 @@ class AutoCron {
} }
/** /**
* Check if there are started cronJobs, older than $ageMaxMinutes * Check if there are started cronJobs, older than $ageMaxMinutes.
* *
* @param int $ageMaxMinutes * @param int $ageMaxMinutes
* *
...@@ -102,6 +104,8 @@ class AutoCron { ...@@ -102,6 +104,8 @@ class AutoCron {
} }
/** /**
* Check if $job has expired. If yes, calculate next run and set $job[AUTOCRON_NEXT_RUN].
*
* @param array $job * @param array $job
* *
* @return array * @return array
...@@ -199,6 +203,8 @@ class AutoCron { ...@@ -199,6 +203,8 @@ class AutoCron {
} }
/** /**
* Fill all necessary elements.
*
* @param array $mailEntry * @param array $mailEntry
* *
* @return array * @return array
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment