clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Poller: The maximum number of connections can now be configured

This commit is contained in:
Michael Vogel 2016-02-09 23:28:33 +01:00
parent b5100b3154
commit 211be5bfc5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dfrn.php
View File

@ -1252,8 +1252,10 @@ class dfrn {
// Update check for this field has to be done differently // Update check for this field has to be done differently
$datefields = array("name-date", "uri-date"); $datefields = array("name-date", "uri-date");
foreach ($datefields AS $field) foreach ($datefields AS $field)
if (strtotime($contact[$field]) > strtotime($r[0][$field])) if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
logger("Difference for contact ".$contact["id"]." in field '".$field."'. Old value: '".$contact[$field]."', new value '".$r[0][$field]."'", LOGGER_DEBUG);
$update = true; $update = true;
}
foreach ($fields AS $field => $data) foreach ($fields AS $field => $data)
if ($contact[$field] != $r[0][$field]) { if ($contact[$field] != $r[0][$field]) {

11
include/poller.php
View File

@ -130,9 +130,14 @@ function poller_max_connections_reached() {
if (!$r) if (!$r)
return false; return false;
$max = intval($r[0]["Value"]); // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself.
if ($max == 0) $max = get_config("system", "max_connections");
return false;
if ($max == 0) {
$max = intval($r[0]["Value"]);
if ($max == 0)
return false;
}
$r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); $r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
if (!$r) if (!$r)