Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 4eb5e8a2b912bd2b22df8cfec3c1822adbc9c1d1..e85a4555d31286767b6e8ebb10bd37a8b81bf7fc 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -9,10 +9,10 @@ function poller_run(&$argv, &$argc){
        if(is_null($a)) {
                $a = new App;
        }
-  
+
        if(is_null($db)) {
            @include(".htconfig.php");
-       require_once("dba.php");
+       require_once("include/dba.php");
            $db = new dba($db_host, $db_user, $db_pass, $db_data);
        unset($db_host, $db_user, $db_pass, $db_data);
        };
@@ -57,17 +57,21 @@ function poller_run(&$argv, &$argc){
        load_hooks();
 
        logger('poller: start');
-       
+
        // run queue delivery process in the background
 
        proc_run('php',"include/queue.php");
-       
+
+       // run diaspora photo queue process in the background
+
+       proc_run('php',"include/dsprphotoq.php");
+
        // expire any expired accounts
 
        q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 
                AND `account_expires_on` != '0000-00-00 00:00:00' 
                AND `account_expires_on` < UTC_TIMESTAMP() ");
-       
+
        // delete user and contact records for recently removed accounts
 
        $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@@ -77,12 +81,13 @@ function poller_run(&$argv, &$argc){
                        q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
                }
        }
-  
+
        $abandon_days = intval(get_config('system','account_abandon_days'));
        if($abandon_days < 1)
                $abandon_days = 0;
 
-       
+       // Check OStatus conversations
+       check_conversations();
 
        // once daily run birthday_updates and then expire in background
 
@@ -99,14 +104,26 @@ function poller_run(&$argv, &$argc){
                proc_run('php','include/expire.php');
        }
 
-       // clear old cache
-       Cache::clear();
+       $last = get_config('system','cache_last_cleared');
+
+       if($last) {
+               $next = $last + (3600); // Once per hour
+               $clear_cache = ($next <= time());
+        } else
+               $clear_cache = true;
 
-       // clear old item cache files
-       clear_cache();
+       if ($clear_cache) {
+               // clear old cache
+               Cache::clear();
 
-       // clear cache for photos
-       clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+               // clear old item cache files
+               clear_cache();
+
+               // clear cache for photos
+               clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
+               set_config('system','cache_last_cleared', time());
+       }
 
        $manual_id  = 0;
        $generation = 0;