From c549ae939cd424c18052efd31f2d25ff9073f05f Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 2 Jul 2016 09:31:28 +0200
Subject: [PATCH] Added the new function to the poller.

---
 include/dba.php    |  1 +
 include/poller.php | 29 +++++------------------------
 index.php          |  1 -
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index cae045d874..6ce095fc65 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,4 +1,5 @@
 <?php
+require_once("dbm.php");
 
 # if PDO is avaible for mysql, use the new database abstraction
 # TODO: PDO is disabled for release 3.3. We need to investigate why
diff --git a/include/poller.php b/include/poller.php
index a391ea8c75..2eca03ef98 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -11,7 +11,6 @@ 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;
@@ -27,19 +26,8 @@ function poller_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
-	$max_processes = get_config('system', 'max_processes_backend');
-	if (intval($max_processes) == 0)
-		$max_processes = 5;
-
-	$processlist = dbm::processlist();
-	if ($processlist["list"] != "") {
-		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;
-		}
-	}
+	if ($a->max_processes_reached())
+		return;
 
 	if (poller_max_connections_reached())
 		return;
@@ -74,16 +62,9 @@ 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 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())
diff --git a/index.php b/index.php
index d2d3ecec3a..cde267cd19 100644
--- a/index.php
+++ b/index.php
@@ -45,7 +45,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
  */
 
 require_once("include/dba.php");
-require_once("include/dbm.php");
 
 if(!$install) {
 	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-- 
2.39.5