Merge https://github.com/friendica/friendica into pull

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index e927430ea9e7ef6ab2831a2b35869c85d7fb7503..e94ab8746f5c1f3c7cf19af166c2ff1e7a240eaa 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -41,11 +41,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 +95,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');
@@ -125,6 +134,16 @@ function poller_run(&$argv, &$argc){
                // 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());
        }
 
@@ -171,9 +190,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 
@@ -181,7 +200,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)) {