X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fpoller.php;h=d134f30d0fac270001d5cac8d9e98bc1411d81d7;hb=8a11a60932115725d65791d99a817aefbde174b7;hp=b0e88f73dd00e37948aaf86e537d86b088b45d11;hpb=9cfc249b12b3d8b756cc914b0a03a17957e49a77;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index b0e88f73dd..d134f30d0f 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,6 +26,9 @@ function poller_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
+	if ($a->max_processes_reached())
+		return;
+
 	if (poller_max_connections_reached())
 		return;
 
@@ -59,6 +62,10 @@ function poller_run(&$argv, &$argc){
 
 	while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+		// Constantly check the number of parallel database processes
+		if ($a->max_processes_reached())
+			return;
+
 		// Constantly check the number of available database connections to let the frontend be accessible at any time
 		if (poller_max_connections_reached())
 			return;
@@ -125,6 +132,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'");
@@ -153,10 +165,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;
 		}
 	}
@@ -181,12 +193,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;
 }
 
@@ -197,7 +209,7 @@ 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)) {
+	if (!dbm::is_result($r)) {
 		// No processing here needed
 		return;
 	}