From a203820efeeae5b14fbc59140205e87fb40294f9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 4 Nov 2011 15:21:46 -0700
Subject: reduce polling load

---
 boot.php           |  2 +-
 include/poller.php | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index 6b549a48a..251ce2a3f 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Friendica');
-define ( 'FRIENDIKA_VERSION',      '2.3.1154' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1155' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1102      );
 
diff --git a/include/poller.php b/include/poller.php
index 92594568e..d9e5282f2 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -108,13 +108,14 @@ function poller_run($argv, $argc){
 
 	$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-		AND `network` != '%s'
+		AND NOT `network` IN ( '%s', '%s' )
 		$sql_extra 
 		AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
 		AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
 		intval(CONTACT_IS_SHARING),
 		intval(CONTACT_IS_FRIEND),
-		dbesc(NETWORK_DIASPORA)
+		dbesc(NETWORK_DIASPORA),
+		dbesc(NETWORK_FACEBOOK)
 	);
 
 	if(! count($contacts)) {
@@ -137,6 +138,9 @@ function poller_run($argv, $argc){
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
+			if($contact['network'] === NETWORK_DFRN)
+				$contact['priority'] = 2;
+
 			if($contact['priority'] || $contact['subhub']) {
 
 				$hub_update = true;
@@ -218,7 +222,7 @@ function poller_run($argv, $argc){
 
 			$importer = $r[0];
 
-			logger("poller: poll: IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
+			logger("poller: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
 			$last_update = (($contact['last-update'] === '0000-00-00 00:00:00') 
 				? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME)
@@ -539,8 +543,9 @@ function poller_run($argv, $argc){
 				);
 			}
 			if(count($r)) {
-				if(! $r[0]['total'])
+				if(! $r[0]['total']) {
 					poco_load($contact['id'],$importer_uid,$contact['poco']);
+				}
 			}
 
 			// loop - next contact
-- 
cgit v1.2.3