Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index cef11a74431a111fa268fe93ea919ab4539a89f9..28dc0c0cde03748f926822923b6855d9b70aba4e 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -36,6 +36,7 @@ function poller_run(&$argv, &$argc){
        require_once('include/email.php');
        require_once('include/socgraph.php');
        require_once('include/pidfile.php');
+       require_once('mod/nodeinfo.php');
 
        load_config('config');
        load_config('system');
@@ -46,7 +47,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 +83,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 +112,17 @@ 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);
+
+       // Follow your friends from your legacy OStatus account
+       ostatus_check_follow_friends();
+
+       // update nodeinfo data
+       nodeinfo_cron();
 
        // To-Do: Regenerate usage statistics
        // q("ANALYZE TABLE `item`");