nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2348 from annando/1602-poller-again

Browse source 
Database connections: When we now check for user values and system values
This commit is contained in:
Tobias Diekershoff 2016-02-12 11:25:49 +01:00
parent 8451397857 acb09d3a3d
commit 036311237f
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/poller.php
View file

@ -161,8 +161,17 @@ function poller_max_connections_reached() {
$used = count($r);
logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
} else {
// Since there are no user specific limitations we will now check for the system values
$level = $used / $max;
if ($level >= (3/4)) {
logger("Maximum level (3/4) of user connections reached: ".$used."/".$max);
return true;
}
}
// We will now check for the system values.
// This limit could be reached although the user limits are fine.
$r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
if (!$r)
return false;
@ -180,16 +189,14 @@ function poller_max_connections_reached() {
return false;
logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
}
$level = $used / $max;
if ($level < (3/4))
return false;
logger("Maximum level (3/4) of connections reached: ".$used."/".$max);
logger("Maximum level (3/4) of system connections reached: ".$used."/".$max);
return true;
}
/**