Merge pull request #10941 from nupplaphil/feat/worker_paradigm

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index faa29717c145b05ae521d25bff671672524ffe63..8dd1ece8e5e41ada1cc0bfb4a9ed85de59ce219a 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -52,7 +52,7 @@ class Worker
        private static $last_update;
        private static $state;
        private static $daemon_mode = null;
-       /** @var Worker\Entity\Process */
+       /** @var Process */
        private static $process;
 
        /**
@@ -1183,22 +1183,22 @@ class Worker
                DBA::connect();
 
                DI::flushLogger();
-               $process = DI::process()->create($pid);
+               $process = DI::process()->create(getmypid(), basename(__FILE__));
 
                $cycles = 0;
-               while (!self::IPCJobsExists($pid) && (++$cycles < 100)) {
+               while (!self::IPCJobsExists($process->pid) && (++$cycles < 100)) {
                        usleep(10000);
                }
 
-               Logger::info('Worker spawned', ['pid' => $pid, 'wait_cycles' => $cycles]);
+               Logger::info('Worker spawned', ['pid' => $process->pid, 'wait_cycles' => $cycles]);
 
                self::processQueue($do_cron, $process);
 
                self::unclaimProcess($process);
 
-               self::IPCSetJobState(false, $pid);
+               self::IPCSetJobState(false, $process->pid);
                DI::process()->delete($process);
-               Logger::info('Worker ended', ['pid' => $pid]);
+               Logger::info('Worker ended', ['pid' => $process->pid]);
                exit();
        }