X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fworker.php;h=d6ecbecc264935036eb1427e72f65f9c4da3ad62;hb=a5e91175243a41c77a56e73efc3672f20a7e6d23;hp=1375799667f502a4bb8fc90ffb12047812e04d76;hpb=636a0333646b0ca941a3eadaa246002001915303;p=friendica.git

diff --git a/mod/worker.php b/mod/worker.php
index 1375799667..d6ecbecc26 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -1,12 +1,12 @@
 <?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\Worker;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 function worker_init($a){
 
@@ -14,7 +14,14 @@ function worker_init($a){
 		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'");
 
@@ -26,13 +33,22 @@ function worker_init($a){
 
 	logger("Front end worker started: ".getmypid());
 
-	call_worker();
+	Worker::callWorker();
 
-	if ($r = poller_worker_process()) {
-		poller_execute($r[0]);
+	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])) {
+			Worker::execute($r[0]);
+		}
 	}
 
-	call_worker();
+	Worker::callWorker();
+
+	Worker::unclaimProcess();
 
 	$a->end_process();