From 4c901e60cca29c038875c851c3272f59207e0596 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 19 Feb 2015 21:36:29 +0100 Subject: [PATCH 1/4] More logging for the poller. Changed the query for the contacts to reduce the amount of contacts --- include/poller.php | 50 ++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/include/poller.php b/include/poller.php index cefa713a0d..781d3ace30 100644 --- a/include/poller.php +++ b/include/poller.php @@ -84,8 +84,8 @@ function poller_run(&$argv, &$argc){ // expire any expired accounts - q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 - AND `account_expires_on` != '0000-00-00 00:00:00' + q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 + AND `account_expires_on` != '0000-00-00 00:00:00' AND `account_expires_on` < UTC_TIMESTAMP() "); // delete user and contact records for recently removed accounts @@ -179,7 +179,7 @@ function poller_run(&$argv, &$argc){ } $interval = intval(get_config('system','poll_interval')); - if(! $interval) + if(! $interval) $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); @@ -192,26 +192,27 @@ function poller_run(&$argv, &$argc){ proc_run('php','include/cronhooks.php'); // Only poll from those with suitable relationships, - // and which have a polling address and ignore Diaspora since + // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - $abandon_sql = (($abandon_days) - ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) - : '' + $abandon_sql = (($abandon_days) + ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) + : '' ); - $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' - AND NOT `network` IN ( '%s', '%s', '%s' ) - $sql_extra - AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 - AND `contact`.`archive` = 0 - AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()", + $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s') + $sql_extra + AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive` + AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND), - dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_FACEBOOK), - dbesc(NETWORK_PUMPIO) + dbesc(NETWORK_DFRN), + dbesc(NETWORK_ZOT), + dbesc(NETWORK_OSTATUS), + dbesc(NETWORK_FEED), + dbesc(NETWORK_MAIL), + dbesc(NETWORK_MAIL2) ); if(! count($contacts)) { @@ -229,6 +230,8 @@ function poller_run(&$argv, &$argc){ foreach($res as $contact) { + logger("Check for polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]); + $xml = false; if($manual_id) @@ -291,22 +294,21 @@ function poller_run(&$argv, &$argc){ $update = true; break; } - if((! $update) && (! $force)) + if((!$update) && (!$force)) continue; } - // Don't run onepoll.php if the contact isn't pollable - // This check also is inside the onepoll.php - but this will reduce the load - if (in_array($contact["rel"], array(CONTACT_IS_SHARING, CONTACT_IS_FRIEND)) AND ($contact["poll"] != "") - AND !in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_FACEBOOK, NETWORK_PUMPIO, NETWORK_TWITTER, NETWORK_APPNET)) - AND !$contact["self"] AND !$contact["blocked"] AND !$contact["readonly"] AND !$contact["archive"]) - proc_run('php','include/onepoll.php',$contact['id']); + logger("Polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]); + + proc_run('php','include/onepoll.php',$contact['id']); if($interval) @time_sleep_until(microtime(true) + (float) $interval); } } + logger('poller: end'); + return; } From 68c970722138132ba240aea8ea69f93f3b6a1ec1 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 19 Feb 2015 22:04:05 +0100 Subject: [PATCH 2/4] The poller now always respects the priority setting for feeds. --- include/poller.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/poller.php b/include/poller.php index 781d3ace30..1967d59c6e 100644 --- a/include/poller.php +++ b/include/poller.php @@ -230,8 +230,6 @@ function poller_run(&$argv, &$argc){ foreach($res as $contact) { - logger("Check for polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]); - $xml = false; if($manual_id) @@ -243,7 +241,7 @@ function poller_run(&$argv, &$argc){ if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS)) $contact['priority'] = 2; - if($contact['priority'] || $contact['subhub']) { + if(($contact['priority'] || $contact['subhub']) AND ($contact['network'] != NETWORK_FEED)) { $hub_update = true; $update = false; From ab5bf06873d589aab1f452fa88db5ddfd6b9e942 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 19 Feb 2015 22:30:16 +0100 Subject: [PATCH 3/4] Restructured and simplified the poller check --- include/poller.php | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/include/poller.php b/include/poller.php index 1967d59c6e..87c9c95270 100644 --- a/include/poller.php +++ b/include/poller.php @@ -159,7 +159,6 @@ function poller_run(&$argv, &$argc){ $manual_id = 0; $generation = 0; - $hub_update = false; $force = false; $restart = false; @@ -235,35 +234,24 @@ function poller_run(&$argv, &$argc){ if($manual_id) $contact['last-update'] = '0000-00-00 00:00:00'; - if($contact['network'] === NETWORK_DFRN) + if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) $contact['priority'] = 2; - if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS)) - $contact['priority'] = 2; - - if(($contact['priority'] || $contact['subhub']) AND ($contact['network'] != NETWORK_FEED)) { - - $hub_update = true; - $update = false; - - $t = $contact['last-update']; - + if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { // We should be getting everything via a hub. But just to be sure, let's check once a day. // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) // This also lets us update our subscription to the hub, and add or replace hubs in case it // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. + $poll_interval = get_config('system','pushpoll_frequency'); + $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); + } - if($contact['subhub']) { - $poll_interval = get_config('system','pushpoll_frequency'); - $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); - $hub_update = false; + if($contact['priority'] AND !$force) { - if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force) - $hub_update = true; - } - else - $hub_update = false; + $update = false; + + $t = $contact['last-update']; /** * Based on $contact['priority'], should we poll this site now? Or later? @@ -292,7 +280,7 @@ function poller_run(&$argv, &$argc){ $update = true; break; } - if((!$update) && (!$force)) + if(!$update) continue; } From dfdb804323011a5983ee33a814e7604bfd300f49 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 19 Feb 2015 22:38:02 +0100 Subject: [PATCH 4/4] Beautified the poller logging --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 87c9c95270..cef11a7443 100644 --- a/include/poller.php +++ b/include/poller.php @@ -284,7 +284,7 @@ function poller_run(&$argv, &$argc){ continue; } - logger("Polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]); + logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]); proc_run('php','include/onepoll.php',$contact['id']);