X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fworker.php;h=23dfd6e0004ba7cc46ae7189270a856c40776abc;hb=5f2028b657332c7dceb1e14dc0e1cd175fc61a7c;hp=c202a28d64d95feb1765485efad7733ab3fa96c3;hpb=45ebeba643a6d600e8778475f70f827f32bf3146;p=friendica.git

diff --git a/mod/worker.php b/mod/worker.php
index c202a28d64..23dfd6e000 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -1,27 +1,33 @@
 <?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\Logger;
+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") OR !Config::get("system", "worker")) {
+	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")) {
-		call_worker_if_idle();
+		Worker::executeIfIdle();
 		return;
 	}
 
-	clear_worker_processes();
+	Worker::clearProcesses();
 
 	$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'");
 
@@ -29,26 +35,31 @@ function worker_init($a){
 		return;
 	}
 
-	$a->start_process();
-
-	logger("Front end worker started: ".getmypid());
+	Worker::startProcess();
 
-	call_worker();
+	Logger::log("Front end worker started: ".getmypid());
 
-	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());
+	Logger::log("Front end worker ended: ".getmypid());
 
-	killme();
+	exit();
 }