friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2338 from annando/1602-poller-max 

Poller: The maximum number of connections can now be configured
This commit is contained in:
Tobias Diekershoff 2016-02-10 12:49:49 +01:00
parent b5100b3154 902820b30d
commit 255638ff65
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/htconfig.md
View File

@ -34,6 +34,7 @@ line to your .htconfig.php:
* like_no_comment (Boolean) - Don't update the "commented" value of an item when it is liked. * like_no_comment (Boolean) - Don't update the "commented" value of an item when it is liked.
* local_block (Boolean) - Used in conjunction with "block_public". * local_block (Boolean) - Used in conjunction with "block_public".
* local_search (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system. * local_search (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system.
* max_connections - The poller process isn't started when 3/4 of the possible database connections are used. When the system can't detect the maximum numbers of connection then this value can be used.
* max_contact_queue - Default value is 500. * max_contact_queue - Default value is 500.
* max_batch_queue - Default value is 1000. * max_batch_queue - Default value is 1000.
* no_oembed (Boolean) - Don't use OEmbed to fetch more information about a link. * no_oembed (Boolean) - Don't use OEmbed to fetch more information about a link.

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)