keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added the new function to the poller.

Browse source
This commit is contained in:
Michael Vogel 2016-07-02 09:31:28 +02:00
parent b3c8ff836d
commit c549ae939c
3 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/dba.php
View file

@ -1,4 +1,5 @@
<?php <?php
require_once("dbm.php");
# if PDO is avaible for mysql, use the new database abstraction # if PDO is avaible for mysql, use the new database abstraction
# TODO: PDO is disabled for release 3.3. We need to investigate why # TODO: PDO is disabled for release 3.3. We need to investigate why

29
include/poller.php
View file

@ -11,7 +11,6 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
} }
require_once("boot.php"); require_once("boot.php");
require_once("dbm.php");
function poller_run(&$argv, &$argc){ function poller_run(&$argv, &$argc){
global $a, $db; global $a, $db;
@ -27,19 +26,8 @@ function poller_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
}; };
$max_processes = get_config('system', 'max_processes_backend'); if ($a->max_processes_reached())
if (intval($max_processes) == 0) return;
$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 (poller_max_connections_reached()) if (poller_max_connections_reached())
return; 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")) { 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 // Constantly check the number of parallel database processes
$processlist = dbm::processlist(); if ($a->max_processes_reached())
if ($processlist["amount"] != "") { return;
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 // Constantly check the number of available database connections to let the frontend be accessible at any time
if (poller_max_connections_reached()) if (poller_max_connections_reached())

1
index.php
View file

@ -45,7 +45,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
*/ */
require_once("include/dba.php"); require_once("include/dba.php");
require_once("include/dbm.php");
if(!$install) { if(!$install) {
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);