The poller can now be called even inside the "include" directory.

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index e85a4555d31286767b6e8ebb10bd37a8b81bf7fc..f95d3b180787209720373ef8d102f9b41ba4f3cf 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,4 +1,15 @@
 <?php
+if (sizeof($_SERVER["argv"]) == 0)
+       die();
+
+$directory = dirname($_SERVER["argv"][0]);
+
+if (substr($directory, 0, 1) != "/")
+       $directory = $_SERVER["PWD"]."/".$directory;
+
+$directory = realpath($directory."/..");
+
+chdir($directory);
 
 require_once("boot.php");
 
@@ -41,11 +52,17 @@ function poller_run(&$argv, &$argc){
                }
        }
 
-       $lockpath = get_config('system','lockpath');
+       $lockpath = get_lockpath();
        if ($lockpath != '') {
-               $pidfile = new pidfile($lockpath, 'poller.lck');
+               $pidfile = new pidfile($lockpath, 'poller');
                if($pidfile->is_already_running()) {
                        logger("poller: Already running");
+                       if ($pidfile->running_time() > 9*60) {
+                                $pidfile->kill();
+                                logger("poller: killed stale process");
+                                // Calling a new instance
+                                proc_run('php','include/poller.php');
+                        }
                        exit;
                }
        }
@@ -89,6 +106,9 @@ function poller_run(&$argv, &$argc){
        // Check OStatus conversations
        check_conversations();
 
+       // To-Do: Regenerate usage statistics
+       // q("ANALYZE TABLE `item`");
+
        // once daily run birthday_updates and then expire in background
 
        $d1 = get_config('system','last_expire_day');
@@ -122,6 +142,19 @@ function poller_run(&$argv, &$argc){
                // clear cache for photos
                clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
 
+               // clear smarty cache
+               clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+
+               // clear cache for image proxy
+               if (!get_config("system", "proxy_disabled")) {
+                       clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+
+                       $cachetime = get_config('system','proxy_cache_time');
+                       if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;
+
+                       q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
+               }
+
                set_config('system','cache_last_cleared', time());
        }
 
@@ -168,9 +201,9 @@ function poller_run(&$argv, &$argc){
                : '' 
        );
 
-       $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+       $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' )
+               AND NOT `network` IN ( '%s', '%s', '%s' )
                $sql_extra 
                AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
                AND `contact`.`archive` = 0 
@@ -178,7 +211,8 @@ function poller_run(&$argv, &$argc){
                intval(CONTACT_IS_SHARING),
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DIASPORA),
-               dbesc(NETWORK_FACEBOOK)
+               dbesc(NETWORK_FACEBOOK),
+               dbesc(NETWORK_PUMPIO)
        );
 
        if(! count($contacts)) {
@@ -217,14 +251,14 @@ function poller_run(&$argv, &$argc){
                                // 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'. 
+                               // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
 
 
                                if($contact['subhub']) {
                                        $poll_interval = get_config('system','pushpoll_frequency');
                                        $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
                                        $hub_update = false;
-       
+
                                        if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)
                                                        $hub_update = true;
                                }
@@ -233,13 +267,13 @@ function poller_run(&$argv, &$argc){
 
                                /**
                                 * Based on $contact['priority'], should we poll this site now? Or later?
-                                */                     
+                                */
 
                                switch ($contact['priority']) {
                                        case 5:
                                                if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month"))
                                                        $update = true;
-                                               break;                                  
+                                               break;
                                        case 4:
                                                if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
                                                        $update = true;
@@ -262,7 +296,13 @@ function poller_run(&$argv, &$argc){
                                        continue;
                        }
 
-                       proc_run('php','include/onepoll.php',$contact['id']);
+                       // 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']);
+
                        if($interval)
                                @time_sleep_until(microtime(true) + (float) $interval);
                }
@@ -272,6 +312,6 @@ function poller_run(&$argv, &$argc){
 }
 
 if (array_search(__file__,get_included_files())===0){
-  poller_run($argv,$argc);
+  poller_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }