X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=22fdbb5e5374a016a4ec61533727782a12ac6c26;hb=b580a338f602fea96e42f988fa468d55689dd62f;hp=90e94ede9e05af23ba0bd56791569bbc6e0e1125;hpb=acb09d3a3d34ba180ef8804abf5e032b725f62e3;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index 90e94ede9e..22fdbb5e53 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -11,6 +11,7 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 require_once("boot.php");
+require_once("dbm.php");
 
 function poller_run(&$argv, &$argc){
 	global $a, $db;
@@ -26,21 +27,26 @@ function poller_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
-	if (poller_max_connections_reached())
-		return;
+	$max_processes = get_config('system', 'max_processes_backend');
+	if (intval($max_processes) == 0)
+		$max_processes = 5;
 
-	$load = current_load();
-	if($load) {
-		$maxsysload = intval(get_config('system','maxloadavg'));
-		if($maxsysload < 1)
-			$maxsysload = 50;
+	$processlist = dbm::processlist();
+	if ($processlist["list"] != "") {
+		logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
 
-		if(intval($load) > $maxsysload) {
-			logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
+		if ($processlist["amount"] > $max_processes) {
+			logger("Processcheck: Maximum number of processes for backend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
 			return;
 		}
 	}
 
+	if (poller_max_connections_reached())
+		return;
+
+	if (App::maxload_reached())
+		return;
+
 	// Checking the number of workers
 	if (poller_too_much_workers(1)) {
 		poller_kill_stale_workers();
@@ -68,6 +74,17 @@ function poller_run(&$argv, &$argc){
 
 	while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+		// Log the type of database processes
+		$processlist = dbm::processlist();
+		if ($processlist["amount"] != "") {
+			logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
+
+			if ($processlist["amount"] > $max_processes) {
+				logger("Processcheck: Maximum number of processes for backend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
+				return;
+			}
+		}
+
 		// Constantly check the number of available database connections to let the frontend be accessible at any time
 		if (poller_max_connections_reached())
 			return;
@@ -134,6 +151,11 @@ function poller_max_connections_reached() {
 	// Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself.
 	$max = get_config("system", "max_connections");
 
+	// Fetch the percentage level where the poller will get active
+	$maxlevel = get_config("system", "max_connections_level");
+	if ($maxlevel == 0)
+		$maxlevel = 75;
+
 	if ($max == 0) {
 		// the maximum number of possible user connections can be a system variable
 		$r = q("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
@@ -162,10 +184,10 @@ function poller_max_connections_reached() {
 
 		logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
 
-		$level = $used / $max;
+		$level = ($used / $max) * 100;
 
-		if ($level >= (3/4)) {
-			logger("Maximum level (3/4) of user connections reached: ".$used."/".$max);
+		if ($level >= $maxlevel) {
+			logger("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
 			return true;
 		}
 	}
@@ -190,12 +212,12 @@ function poller_max_connections_reached() {
 
 	logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
 
-	$level = $used / $max;
+	$level = $used / $max * 100;
 
-	if ($level < (3/4))
+	if ($level < $maxlevel)
 		return false;
 
-	logger("Maximum level (3/4) of system connections reached: ".$used."/".$max);
+	logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
 	return true;
 }
 
@@ -205,6 +227,12 @@ function poller_max_connections_reached() {
  */
 function poller_kill_stale_workers() {
 	$r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+	if (!dba::is_result($r)) {
+		// No processing here needed
+		return;
+	}
+
 	foreach($r AS $pid)
 		if (!posix_kill($pid["pid"], 0))
 			q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",