X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=7cc1a285276222cd1d1e0c06472fef06865cc111;hb=9eca83e29c6f292ab4d95d90789df06bf8d04d34;hp=781d3ace30e6e02e0340d0fdcad90fffd1c27b79;hpb=4c901e60cca29c038875c851c3272f59207e0596;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index 781d3ace30..7cc1a28527 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -46,7 +46,7 @@ function poller_run(&$argv, &$argc){
 	if(function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
 		if(intval($load[0]) > $maxsysload) {
-			logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
+			logger('system: load ' . $load[0] . ' too high. Poller deferred to next scheduled run.');
 			return;
 		}
 	}
@@ -82,6 +82,14 @@ function poller_run(&$argv, &$argc){
 
 	proc_run('php',"include/dsprphotoq.php");
 
+	// run the process to discover global contacts in the background
+
+	proc_run('php',"include/discover_poco.php");
+
+	// run the process to update locally stored global contacts in the background
+
+	proc_run('php',"include/discover_poco.php", "checkcontact");
+
 	// expire any expired accounts
 
 	q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
@@ -103,7 +111,11 @@ function poller_run(&$argv, &$argc){
 		$abandon_days = 0;
 
 	// Check OStatus conversations
-	check_conversations();
+	// Check only conversations with mentions (for a longer time)
+	check_conversations(true);
+
+	// Check every conversation
+	check_conversations(false);
 
 	// To-Do: Regenerate usage statistics
 	// q("ANALYZE TABLE `item`");
@@ -159,7 +171,6 @@ function poller_run(&$argv, &$argc){
 
 	$manual_id  = 0;
 	$generation = 0;
-	$hub_update = false;
 	$force      = false;
 	$restart    = false;
 
@@ -230,42 +241,29 @@ 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)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
-			if($contact['network'] === NETWORK_DFRN)
-				$contact['priority'] = 2;
-
-			if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
+			if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
 				$contact['priority'] = 2;
 
-			if($contact['priority'] || $contact['subhub']) {
-
-				$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?
@@ -294,11 +292,11 @@ function poller_run(&$argv, &$argc){
 							$update = true;
 						break;
 				}
-				if((!$update) && (!$force))
+				if(!$update)
 					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']);