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

Database connections: When we now check for user values we check the system values as well

Browse source
This commit is contained in:
Michael Vogel 2016-02-12 11:04:25 +01:00
parent 8451397857
commit acb09d3a3d
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
include/poller.php
View file

@ -161,35 +161,42 @@ function poller_max_connections_reached() {
$used = count($r); $used = count($r);
logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG); 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
$r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
if (!$r)
return false;
$max = intval($r[0]["Value"]); $level = $used / $max;
if ($max == 0)
return false;
$r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); if ($level >= (3/4)) {
if (!$r) logger("Maximum level (3/4) of user connections reached: ".$used."/".$max);
return false; return true;
}
$used = intval($r[0]["Value"]);
if ($used == 0)
return false;
logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
} }
// 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;
$max = intval($r[0]["Value"]);
if ($max == 0)
return false;
$r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
if (!$r)
return false;
$used = intval($r[0]["Value"]);
if ($used == 0)
return false;
logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
$level = $used / $max; $level = $used / $max;
if ($level < (3/4)) if ($level < (3/4))
return false; 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; return true;
} }
/** /**