aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-14 22:59:34 -0700
committerFriendika <info@friendika.com>2011-08-14 22:59:34 -0700
commit5b24050875bc0b2edfee92005bba7c5ef7a17cab (patch)
tree490f65b87b5d59e44aa62a84d1ad2e78416ba0ba
parentd723ff47708843893956bf30669b4762a6360bcd (diff)
downloadvolse-hubzilla-5b24050875bc0b2edfee92005bba7c5ef7a17cab.tar.gz
volse-hubzilla-5b24050875bc0b2edfee92005bba7c5ef7a17cab.tar.bz2
volse-hubzilla-5b24050875bc0b2edfee92005bba7c5ef7a17cab.zip
split off facebook and other cron hooks from poller
-rw-r--r--include/cronhooks.php41
-rw-r--r--include/poller.php5
2 files changed, 43 insertions, 3 deletions
diff --git a/include/cronhooks.php b/include/cronhooks.php
new file mode 100644
index 000000000..a4eb5fbb3
--- /dev/null
+++ b/include/cronhooks.php
@@ -0,0 +1,41 @@
+require_once("boot.php");
+
+
+function cronhooks_run($argv, $argc){
+ global $a, $db;
+
+ if(is_null($a)) {
+ $a = new App;
+ }
+
+ if(is_null($db)) {
+ @include(".htconfig.php");
+ require_once("dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
+ };
+
+ require_once('include/session.php');
+ require_once('include/datetime.php');
+
+ load_config('config');
+ load_config('system');
+
+ $a->set_baseurl(get_config('system','url'));
+
+ load_hooks();
+
+ logger('cronhooks: start');
+
+
+ $d = datetime_convert();
+
+ call_hooks('cron', $d);
+
+ return;
+}
+
+if (array_search(__file__,get_included_files())===0){
+ cronhooks_run($argv,$argc);
+ killme();
+}
diff --git a/include/poller.php b/include/poller.php
index 86bb8ad55..651736a99 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -80,8 +80,7 @@ function poller_run($argv, $argc){
$d = datetime_convert();
if(! $restart)
- call_hooks('cron', $d);
-
+ proc_run('php','include/cronhooks.php');
$contacts = q("SELECT `id` FROM `contact`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
@@ -101,7 +100,7 @@ function poller_run($argv, $argc){
intval($c['id'])
);
- if(! count($res))
+ if((! $res) || (! count($res)))
continue;
foreach($res as $contact) {