]> git.mxchange.org Git - friendica.git/commitdiff
Just changed some script names
authorMichael Vogel <icarus@dabo.de>
Thu, 10 Sep 2015 21:32:56 +0000 (23:32 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 10 Sep 2015 21:32:56 +0000 (23:32 +0200)
include/cron.php [new file with mode: 0644]
include/poller.php
include/worker.php [deleted file]

diff --git a/include/cron.php b/include/cron.php
new file mode 100644 (file)
index 0000000..ea7fd2c
--- /dev/null
@@ -0,0 +1,308 @@
+<?php
+if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
+       $directory = dirname($_SERVER["argv"][0]);
+
+       if (substr($directory, 0, 1) != "/")
+               $directory = $_SERVER["PWD"]."/".$directory;
+
+       $directory = realpath($directory."/..");
+
+       chdir($directory);
+}
+
+require_once("boot.php");
+
+
+function cron_run(&$argv, &$argc){
+       global $a, $db;
+
+       if(is_null($a)) {
+               $a = new App;
+       }
+
+       if(is_null($db)) {
+               @include(".htconfig.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);
+       };
+
+
+       require_once('include/session.php');
+       require_once('include/datetime.php');
+       require_once('library/simplepie/simplepie.inc');
+       require_once('include/items.php');
+       require_once('include/Contact.php');
+       require_once('include/email.php');
+       require_once('include/socgraph.php');
+       require_once('include/pidfile.php');
+       require_once('mod/nodeinfo.php');
+
+       load_config('config');
+       load_config('system');
+
+       $maxsysload = intval(get_config('system','maxloadavg'));
+       if($maxsysload < 1)
+               $maxsysload = 50;
+       if(function_exists('sys_getloadavg')) {
+               $load = sys_getloadavg();
+               if(intval($load[0]) > $maxsysload) {
+                       logger('system: load ' . $load[0] . ' too high. cron deferred to next scheduled run.');
+                       return;
+               }
+       }
+
+       $lockpath = get_lockpath();
+       if ($lockpath != '') {
+               $pidfile = new pidfile($lockpath, 'cron');
+               if($pidfile->is_already_running()) {
+                       logger("cron: Already running");
+                       if ($pidfile->running_time() > 9*60) {
+                               $pidfile->kill();
+                               logger("cron: killed stale process");
+                               // Calling a new instance
+                               proc_run('php','include/cron.php');
+                       }
+                       exit;
+               }
+       }
+
+
+
+       $a->set_baseurl(get_config('system','url'));
+
+       load_hooks();
+
+       logger('cron: start');
+
+       // 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");
+       if ($r) {
+               foreach($r as $user) {
+                       q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
+                       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 only conversations with mentions (for a longer time)
+       check_conversations(true);
+
+       // Check every conversation
+       check_conversations(false);
+
+       // Follow your friends from your legacy OStatus account
+       // Doesn't work
+       // ostatus_check_follow_friends();
+
+       // update nodeinfo data
+       nodeinfo_cron();
+
+       // 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');
+       $d2 = intval(datetime_convert('UTC','UTC','now','d'));
+
+       if($d2 != intval($d1)) {
+
+               update_contact_birthdays();
+
+               update_suggestions();
+
+               set_config('system','last_expire_day',$d2);
+               proc_run('php','include/expire.php');
+       }
+
+       $last = get_config('system','cache_last_cleared');
+
+       if($last) {
+               $next = $last + (3600); // Once per hour
+               $clear_cache = ($next <= time());
+       } else
+               $clear_cache = true;
+
+       if ($clear_cache) {
+               // clear old cache
+               Cache::clear();
+
+               // clear old item cache files
+               clear_cache();
+
+               // 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());
+       }
+
+       $manual_id  = 0;
+       $generation = 0;
+       $force      = false;
+       $restart    = false;
+
+       if(($argc > 1) && ($argv[1] == 'force'))
+               $force = true;
+
+       if(($argc > 1) && ($argv[1] == 'restart')) {
+               $restart = true;
+               $generation = intval($argv[2]);
+               if(! $generation)
+                       killme();
+       }
+
+       if(($argc > 1) && intval($argv[1])) {
+               $manual_id = intval($argv[1]);
+               $force     = true;
+       }
+
+       $interval = intval(get_config('system','poll_interval'));
+       if(! $interval)
+               $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
+
+       $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
+
+       reload_plugins();
+
+       $d = datetime_convert();
+
+       if(! $restart)
+               proc_run('php','include/cronhooks.php');
+
+       // Only poll from those with suitable relationships,
+       // and which have a polling address and ignore Diaspora since
+       // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+
+       $abandon_sql = (($abandon_days)
+               ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
+               : ''
+       );
+
+       $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+               WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
+               $sql_extra
+               AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
+               AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
+               intval(CONTACT_IS_SHARING),
+               intval(CONTACT_IS_FRIEND),
+               dbesc(NETWORK_DFRN),
+               dbesc(NETWORK_ZOT),
+               dbesc(NETWORK_OSTATUS),
+               dbesc(NETWORK_FEED),
+               dbesc(NETWORK_MAIL),
+               dbesc(NETWORK_MAIL2)
+       );
+
+       if(! count($contacts)) {
+               return;
+       }
+
+       foreach($contacts as $c) {
+
+               $res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                       intval($c['id'])
+               );
+
+               if((! $res) || (! count($res)))
+                       continue;
+
+               foreach($res as $contact) {
+
+                       $xml = false;
+
+                       if($manual_id)
+                               $contact['last-update'] = '0000-00-00 00:00:00';
+
+                       if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
+                               $contact['priority'] = 2;
+
+                       if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
+                               // 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'.
+
+                               $poll_interval = get_config('system','pushpoll_frequency');
+                               $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
+                       }
+
+                       if($contact['priority'] AND !$force) {
+
+                               $update     = false;
+
+                               $t = $contact['last-update'];
+
+                               /**
+                                * 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;
+                                       case 4:
+                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
+                                                       $update = true;
+                                               break;
+                                       case 3:
+                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+                                                       $update = true;
+                                               break;
+                                       case 2:
+                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour"))
+                                                       $update = true;
+                                               break;
+                                       case 1:
+                                       default:
+                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
+                                                       $update = true;
+                                               break;
+                               }
+                               if(!$update)
+                                       continue;
+                       }
+
+                       logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
+
+                       proc_run('php','include/onepoll.php',$contact['id']);
+
+                       if($interval)
+                               @time_sleep_until(microtime(true) + (float) $interval);
+               }
+       }
+
+       logger('cron: end');
+
+       return;
+}
+
+if (array_search(__file__,get_included_files())===0){
+  cron_run($_SERVER["argv"],$_SERVER["argc"]);
+  killme();
+}
index e47ab3782a1b9273f6d708434c5b4c45bf0fd93d..05e936936c2446be046967ea09c53d606e0c9c97 100644 (file)
@@ -12,7 +12,6 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 
 require_once("boot.php");
 
-
 function poller_run(&$argv, &$argc){
        global $a, $db;
 
@@ -21,288 +20,78 @@ function poller_run(&$argv, &$argc){
        }
 
        if(is_null($db)) {
-           @include(".htconfig.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);
-       };
-
-
-       require_once('include/session.php');
-       require_once('include/datetime.php');
-       require_once('library/simplepie/simplepie.inc');
-       require_once('include/items.php');
-       require_once('include/Contact.php');
-       require_once('include/email.php');
-       require_once('include/socgraph.php');
-       require_once('include/pidfile.php');
-       require_once('mod/nodeinfo.php');
-
-       load_config('config');
-       load_config('system');
-
-       $maxsysload = intval(get_config('system','maxloadavg'));
-       if($maxsysload < 1)
-               $maxsysload = 50;
-       if(function_exists('sys_getloadavg')) {
-               $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload) {
-                       logger('system: load ' . $load[0] . ' too high. Poller deferred to next scheduled run.');
-                       return;
-               }
-       }
-
-       $lockpath = get_lockpath();
-       if ($lockpath != '') {
-               $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;
-               }
-       }
-
-
-
-       $a->set_baseurl(get_config('system','url'));
-
-       load_hooks();
-
-       logger('poller: start');
+               @include(".htconfig.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);
+       };
 
-       // expire any expired accounts
+       // run queue delivery process in the background
 
-       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() ");
+       proc_run('php',"include/queue.php");
 
-       // delete user and contact records for recently removed accounts
+       // run diaspora photo queue process in the background
 
-       $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-       if ($r) {
-               foreach($r as $user) {
-                       q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
-                       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 only conversations with mentions (for a longer time)
-       check_conversations(true);
+       proc_run('php',"include/dsprphotoq.php");
 
-       // Check every conversation
-       check_conversations(false);
+       // run the process to discover global contacts in the background
 
-       // Follow your friends from your legacy OStatus account
-       // Doesn't work
-       // ostatus_check_follow_friends();
+       proc_run('php',"include/discover_poco.php");
 
-       // update nodeinfo data
-       nodeinfo_cron();
+       // run the process to update locally stored global contacts in the background
 
-       // To-Do: Regenerate usage statistics
-       // q("ANALYZE TABLE `item`");
+       proc_run('php',"include/discover_poco.php", "checkcontact");
 
-       // once daily run birthday_updates and then expire in background
+       // When everything else is done ...
+       proc_run("php","include/cron.php");
 
-       $d1 = get_config('system','last_expire_day');
-       $d2 = intval(datetime_convert('UTC','UTC','now','d'));
+       // Cleaning killed processes
+       $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+       foreach($r AS $pid)
+               if (!posix_kill($pid["pid"], 0))
+                       q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+                               intval($pid["pid"]));
 
-       if($d2 != intval($d1)) {
-
-               update_contact_birthdays();
-
-               update_suggestions();
-
-               set_config('system','last_expire_day',$d2);
-               proc_run('php','include/expire.php');
-       }
+       // Checking number of workers
+       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
 
-       $last = get_config('system','cache_last_cleared');
+       $queues = intval(get_config("system", "worker_queues"));
 
-       if($last) {
-               $next = $last + (3600); // Once per hour
-               $clear_cache = ($next <= time());
-        } else
-               $clear_cache = true;
+       if ($queues == 0)
+               $queues = 4;
 
-       if ($clear_cache) {
-               // clear old cache
-               Cache::clear();
-
-               // clear old item cache files
-               clear_cache();
-
-               // 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());
-       }
-
-       $manual_id  = 0;
-       $generation = 0;
-       $force      = false;
-       $restart    = false;
-
-       if(($argc > 1) && ($argv[1] == 'force'))
-               $force = true;
-
-       if(($argc > 1) && ($argv[1] == 'restart')) {
-               $restart = true;
-               $generation = intval($argv[2]);
-               if(! $generation)
-                       killme();
-       }
-
-       if(($argc > 1) && intval($argv[1])) {
-               $manual_id = intval($argv[1]);
-               $force     = true;
-       }
-
-       $interval = intval(get_config('system','poll_interval'));
-       if(! $interval)
-               $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
-
-       $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
-
-       reload_plugins();
-
-       $d = datetime_convert();
-
-       if(! $restart)
-               proc_run('php','include/cronhooks.php');
-
-       // Only poll from those with suitable relationships,
-       // and which have a polling address and ignore Diaspora since
-       // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
-
-       $abandon_sql = (($abandon_days)
-               ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
-               : ''
-       );
-
-       $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-               WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
-               $sql_extra
-               AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
-               AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
-               intval(CONTACT_IS_SHARING),
-               intval(CONTACT_IS_FRIEND),
-               dbesc(NETWORK_DFRN),
-               dbesc(NETWORK_ZOT),
-               dbesc(NETWORK_OSTATUS),
-               dbesc(NETWORK_FEED),
-               dbesc(NETWORK_MAIL),
-               dbesc(NETWORK_MAIL2)
-       );
-
-       if(! count($contacts)) {
+       if ($workers[0]["workers"] >= $queues)
                return;
-       }
-
-       foreach($contacts as $c) {
-
-               $res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-                       intval($c['id'])
-               );
-
-               if((! $res) || (! count($res)))
-                       continue;
-
-               foreach($res as $contact) {
 
-                       $xml = false;
+       while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
+               q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
+                       dbesc(datetime_convert()),
+                       intval(getmypid()),
+                       intval($r[0]["id"]));
 
-                       if($manual_id)
-                               $contact['last-update'] = '0000-00-00 00:00:00';
+               $argv = json_decode($r[0]["parameter"]);
 
-                       if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
-                               $contact['priority'] = 2;
+               $argc = count($argv);
 
-                       if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
-                               // 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'.
+               // To-Do: Check for existance
+               require_once(basename($argv[0]));
 
-                               $poll_interval = get_config('system','pushpoll_frequency');
-                               $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
-                       }
+               $funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
-                       if($contact['priority'] AND !$force) {
+               if (function_exists($funcname)) {
+                       logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
+                       $funcname($argv, $argc);
+                       //sleep(10);
+                       logger("Process ".getmypid().": ".$funcname." - done");
 
-                               $update     = false;
-
-                               $t = $contact['last-update'];
-
-                               /**
-                                * 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;
-                                       case 4:
-                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
-                                                       $update = true;
-                                               break;
-                                       case 3:
-                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
-                                                       $update = true;
-                                               break;
-                                       case 2:
-                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour"))
-                                                       $update = true;
-                                               break;
-                                       case 1:
-                                       default:
-                                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
-                                                       $update = true;
-                                               break;
-                               }
-                               if(!$update)
-                                       continue;
-                       }
-
-                       logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
-
-                       proc_run('php','include/onepoll.php',$contact['id']);
-
-                       if($interval)
-                               @time_sleep_until(microtime(true) + (float) $interval);
+                       q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
                }
        }
 
-       logger('poller: end');
-
-       return;
 }
 
 if (array_search(__file__,get_included_files())===0){
   poller_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }
+?>
diff --git a/include/worker.php b/include/worker.php
deleted file mode 100755 (executable)
index c1d9202..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/php
-<?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");
-
-global $a, $db;
-
-if(is_null($a)) {
-       $a = new App;
-}
-
-if(is_null($db)) {
-       @include(".htconfig.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);
-};
-
-// 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");
-
-// run the process to discover global contacts in the background
-
-proc_run('php',"include/discover_poco.php");
-
-// run the process to update locally stored global contacts in the background
-
-proc_run('php',"include/discover_poco.php", "checkcontact");
-
-// When everything else is done ...
-proc_run("php","include/poller.php");
-
-// Cleaning killed processes
-$r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
-foreach($r AS $pid)
-       if (!posix_kill($pid["pid"], 0))
-               q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
-                       intval($pid["pid"]));
-
-// Checking number of workers
-$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
-
-$queues = intval(get_config("system", "worker_queues"));
-
-if ($queues == 0)
-       $queues = 4;
-
-if ($workers[0]["workers"] >= $queues)
-       return;
-
-while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
-       q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
-               dbesc(datetime_convert()),
-               intval(getmypid()),
-               intval($r[0]["id"]));
-
-       $argv = json_decode($r[0]["parameter"]);
-
-       $argc = count($argv);
-
-       // To-Do: Check for existance
-       require_once(basename($argv[0]));
-
-       $funcname=str_replace(".php", "", basename($argv[0]))."_run";
-
-       if (function_exists($funcname)) {
-               logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
-               $funcname($argv, $argc);
-               //sleep(10);
-               logger("Process ".getmypid().": ".$funcname." - done");
-
-               q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
-       }
-}
-
-?>