aboutsummaryrefslogtreecommitdiffstats
path: root/include/poller.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-28 18:50:20 -0800
committerFriendika <info@friendika.com>2011-01-28 18:50:20 -0800
commit26cc2e02fe6e075cd35a3069edbc006219f5b435 (patch)
treeb687508bd7247100ac0dd51ecf36aed9ea97d5cd /include/poller.php
parent5d77bd9489763721b8f3e4a51c8cef1181276157 (diff)
parent302acda0890a472916b759e6340ce77d9803f105 (diff)
downloadvolse-hubzilla-26cc2e02fe6e075cd35a3069edbc006219f5b435.tar.gz
volse-hubzilla-26cc2e02fe6e075cd35a3069edbc006219f5b435.tar.bz2
volse-hubzilla-26cc2e02fe6e075cd35a3069edbc006219f5b435.zip
Merge branch 'fabrixxm-master'
Conflicts: boot.php
Diffstat (limited to 'include/poller.php')
-rw-r--r--include/poller.php44
1 files changed, 27 insertions, 17 deletions
diff --git a/include/poller.php b/include/poller.php
index 024b9fbcd..1003b2f08 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,14 +1,19 @@
<?php
-
-
- require_once('boot.php');
-
- $a = new App;
-
- @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("boot.php");
+
+function poller_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('session.php');
require_once('datetime.php');
@@ -19,11 +24,12 @@
$a->set_baseurl(get_config('system','url'));
logger('poller: start');
-
+
// run queue delivery process in the background
$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
- proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+ //proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+ proc_run($php_path,"include/queue.php");
$hub_update = false;
@@ -46,8 +52,9 @@
$sql_extra
AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
- if(! count($contacts))
- killme();
+ if(! count($contacts)){
+ return;
+ }
foreach($contacts as $contact) {
@@ -265,7 +272,10 @@
// loop - next contact
}
- killme();
-
-
+ return;
+}
+if (array_search(__file__,get_included_files())===0){
+ poller_run($argv,$argc);
+ killme();
+}