X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fworker.php;h=c18155c5fe598ef91f97479b0ae9b58bdc2f46a5;hb=070e1e73d60295e616314c952199fd4b0b209f2d;hp=3fb86dd5b2dadf0d82f7cd924c0049c7ad5aab44;hpb=d55d500e3534579ffbd7d992d5b103d3e9ab1709;p=friendica.git

diff --git a/mod/worker.php b/mod/worker.php
index 3fb86dd5b2..c18155c5fe 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -1,20 +1,29 @@
 <?php
 /**
  * @file mod/worker.php
- * @brief Module for running the poller as frontend process
+ * @brief Module for running the worker as frontend process
  */
-require_once("include/poller.php");
 
-use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
+use Friendica\Core\Config;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
-function worker_init($a){
+function worker_init()
+{
 
 	if (!Config::get("system", "frontend_worker")) {
 		return;
 	}
 
-	clear_worker_processes();
+	// 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")) {
+		Worker::executeIfIdle();
+		return;
+	}
+
+	Worker::clearProcesses();
 
 	$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'");
 
@@ -22,24 +31,29 @@ function worker_init($a){
 		return;
 	}
 
-	$a->start_process();
+	Worker::startProcess();
 
 	logger("Front end worker started: ".getmypid());
 
-	call_worker();
-
-	if ($r = poller_worker_process()) {
+	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);
 
-		poller_execute($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]);
+		}
 	}
 
-	call_worker();
+	Worker::callWorker();
+
+	Worker::unclaimProcess();
 
-	$a->end_process();
+	Worker::endProcess();
 
 	logger("Front end worker ended: ".getmypid());