From d9bdba491a59e9f35752f4508d0fef7a085263b7 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 4 Jun 2018 21:17:37 +0000 Subject: [PATCH] We don't poll, we work ... Bugfix for renamed config value. --- mod/admin.php | 2 +- mod/worker.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 8e7dfc1f49..e05dae540f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -801,7 +801,7 @@ function admin_page_summary(App $a) $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'); } - $last_worker_call = Config::get('system', 'last_poller_execution', false); + $last_worker_call = Config::get('system', 'last_worker_execution', false); if (!$last_worker_call) { $showwarning = true; $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!'); diff --git a/mod/worker.php b/mod/worker.php index 1bd5880789..7b2acad6cd 100644 --- a/mod/worker.php +++ b/mod/worker.php @@ -40,7 +40,9 @@ function worker_init(){ // But since it doesn't destroy anything, we just try to get more execution time in any way. set_time_limit(0); - if (poller_claim_process($r[0])) { + $fields = ['executed' => DateTimeFormat::utcNow(), 'pid' => getmypid(), 'done' => false]; + $condition = ['id' => $r[0]["id"], 'pid' => 0]; + if (dba::update('workerqueue', $fields, $condition)) { Worker::execute($r[0]); } }