Merge pull request #7893 from annando/api-attachments

[friendica.git] / mod / worker.php

diff --git a/mod/worker.php b/mod/worker.php
index 1bd58807895fab1ae5c6782964925ab98151774d..23dfd6e0004ba7cc46ae7189270a856c40776abc 100644 (file)
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -5,14 +5,21 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
-function worker_init(){
+function worker_init()
+{
 
        if (!Config::get("system", "frontend_worker")) {
                return;
        }
 
+       // Ensure that all "strtotime" operations do run timezone independent
+       date_default_timezone_set('UTC');
+
        // We don't need the following lines if we can execute background jobs.
        // So we just wake up the worker if it sleeps.
        if (function_exists("proc_open")) {
@@ -30,17 +37,18 @@ function worker_init(){
 
        Worker::startProcess();
 
-       logger("Front end worker started: ".getmypid());
+       Logger::log("Front end worker started: ".getmypid());
 
        Worker::callWorker();
 
        if ($r = Worker::workerProcess()) {
-
                // On most configurations this parameter wouldn't have any effect.
                // 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]);
                }
        }
@@ -51,7 +59,7 @@ function worker_init(){
 
        Worker::endProcess();
 
-       logger("Front end worker ended: ".getmypid());
+       Logger::log("Front end worker ended: ".getmypid());
 
-       killme();
+       exit();
 }