X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=c9a8bcbddaa0ad908f1b86f0d0c45b3dc4e908ed;hb=01afa7af3042fb56b119e7077c58162e5043c619;hp=83a24c38fe79cbd1e9665358d571df5c51549df9;hpb=1aa07f87a44b50e93f25006c4007450834abda6f;p=friendica.git

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 83a24c38fe..c9a8bcbdda 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -39,6 +39,8 @@ class Worker
 
 	const FAST_COMMANDS = ['APDelivery', 'Delivery', 'CreateShadowEntry'];
 
+	const LOCK_PROCESS = 'worker_process';
+	const LOCK_WORKER = 'worker';
 
 	private static $up_start;
 	private static $db_duration = 0;
@@ -125,9 +127,9 @@ class Worker
 				}
 
 				// Trying to fetch new processes - but only once when successful
-				if (!$refetched && DI::lock()->acquire('worker_process', 0)) {
+				if (!$refetched && DI::lock()->acquire(self::LOCK_PROCESS, 0)) {
 					self::findWorkerProcesses();
-					DI::lock()->release('worker_process');
+					DI::lock()->release(self::LOCK_PROCESS);
 					self::$state = self::STATE_REFETCH;
 					$refetched = true;
 				} else {
@@ -139,21 +141,21 @@ class Worker
 			if (!self::getWaitingJobForPID()) {
 				self::$state = self::STATE_LONG_LOOP;
 
-				if (DI::lock()->acquire('worker', 0)) {
+				if (DI::lock()->acquire(self::LOCK_WORKER, 0)) {
 				// Count active workers and compare them with a maximum value that depends on the load
 					if (self::tooMuchWorkers()) {
 						Logger::info('Active worker limit reached, quitting.');
-						DI::lock()->release('worker');
+						DI::lock()->release(self::LOCK_WORKER);
 						return;
 					}
 
 					// Check free memory
 					if (DI::process()->isMinMemoryReached()) {
 						Logger::info('Memory limit reached, quitting.');
-						DI::lock()->release('worker');
+						DI::lock()->release(self::LOCK_WORKER);
 						return;
 					}
-					DI::lock()->release('worker');
+					DI::lock()->release(self::LOCK_WORKER);
 				}
 			}
 
@@ -731,7 +733,7 @@ class Worker
 				}
 			}
 
-			Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $waiting_processes . $processlist . " - maximum: " . $queues . "/" . $maxqueues, Logger::DEBUG);
+			Logger::notice("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $waiting_processes . $processlist . " - maximum: " . $queues . "/" . $maxqueues);
 
 			// Are there fewer workers running as possible? Then fork a new one.
 			if (!DI::config()->get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && self::entriesExists()) {
@@ -949,14 +951,14 @@ class Worker
 		}
 
 		$stamp = (float)microtime(true);
-		if (!DI::lock()->acquire('worker_process')) {
+		if (!DI::lock()->acquire(self::LOCK_PROCESS)) {
 			return false;
 		}
 		self::$lock_duration += (microtime(true) - $stamp);
 
 		$found = self::findWorkerProcesses();
 
-		DI::lock()->release('worker_process');
+		DI::lock()->release(self::LOCK_PROCESS);
 
 		if ($found) {
 			$stamp = (float)microtime(true);
@@ -996,7 +998,7 @@ class Worker
 		}
 
 		$url = DI::baseUrl() . '/worker';
-		DI::httpRequest()->fetchUrl($url, false, 1);
+		DI::httpRequest()->fetch($url, false, 1);
 	}
 
 	/**
@@ -1194,13 +1196,13 @@ class Worker
 		}
 
 		// If there is a lock then we don't have to check for too much worker
-		if (!DI::lock()->acquire('worker', 0)) {
+		if (!DI::lock()->acquire(self::LOCK_WORKER, 0)) {
 			return $added;
 		}
 
 		// If there are already enough workers running, don't fork another one
 		$quit = self::tooMuchWorkers();
-		DI::lock()->release('worker');
+		DI::lock()->release(self::LOCK_WORKER);
 
 		if ($quit) {
 			return $added;