From: Michael Vogel Date: Tue, 9 Feb 2016 22:28:33 +0000 (+0100) Subject: Poller: The maximum number of connections can now be configured X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=211be5bfc521285f83c9b85211721d7815fa5689;p=friendica.git Poller: The maximum number of connections can now be configured --- diff --git a/include/dfrn.php b/include/dfrn.php index c4999a08e1..6fa47af052 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1252,8 +1252,10 @@ class dfrn { // Update check for this field has to be done differently $datefields = array("name-date", "uri-date"); 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; + } foreach ($fields AS $field => $data) if ($contact[$field] != $r[0][$field]) { diff --git a/include/poller.php b/include/poller.php index 712f6d5788..03f0307712 100644 --- a/include/poller.php +++ b/include/poller.php @@ -130,9 +130,14 @@ function poller_max_connections_reached() { if (!$r) return false; - $max = intval($r[0]["Value"]); - if ($max == 0) - return false; + // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself. + $max = get_config("system", "max_connections"); + + if ($max == 0) { + $max = intval($r[0]["Value"]); + if ($max == 0) + return false; + } $r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); if (!$r)