summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-16 09:25:09 -0800
committerBrion Vibber <brion@pobox.com>2010-02-16 09:25:09 -0800
commitd5cbfe8071d56438cfa168dc3db56a959317eae0 (patch)
treec00ca6c3e0d1bd2fb9b05a515c337b6afce3a070 /scripts
parentd4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff)
parent81b6b58e33f55054b7e5dd546f06dbdb5696ed92 (diff)
Merge branch 'testing' into 0.9.x
Conflicts: lib/iomaster.php
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/queuedaemon.php20
-rwxr-xr-xscripts/xmppdaemon.php28
2 files changed, 29 insertions, 19 deletions
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index 30a8a9602..d372d898f 100755
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -74,8 +74,6 @@ require_once(INSTALLDIR.'/lib/daemon.php');
require_once(INSTALLDIR.'/classes/Queue_item.php');
require_once(INSTALLDIR.'/classes/Notice.php');
-define('CLAIM_TIMEOUT', 1200);
-
/**
* Queue handling daemon...
*
@@ -92,7 +90,7 @@ class QueueDaemon extends SpawningDaemon
function __construct($id=null, $daemonize=true, $threads=1, $allsites=false)
{
parent::__construct($id, $daemonize, $threads);
- $this->all = $allsites;
+ $this->allsites = $allsites;
}
/**
@@ -108,7 +106,7 @@ class QueueDaemon extends SpawningDaemon
$this->log(LOG_INFO, 'checking for queued notices');
$master = new QueueMaster($this->get_id());
- $master->init($this->all);
+ $master->init($this->allsites);
try {
$master->service();
} catch (Exception $e) {
@@ -133,14 +131,16 @@ class QueueMaster extends IoMaster
*/
function initManagers()
{
- $classes = array();
- if (Event::handle('StartQueueDaemonIoManagers', array(&$classes))) {
- $classes[] = 'QueueManager';
+ $managers = array();
+ if (Event::handle('StartQueueDaemonIoManagers', array(&$managers))) {
+ $qm = QueueManager::get();
+ $qm->setActiveGroup('main');
+ $managers[] = $qm;
}
- Event::handle('EndQueueDaemonIoManagers', array(&$classes));
+ Event::handle('EndQueueDaemonIoManagers', array(&$managers));
- foreach ($classes as $class) {
- $this->instantiate($class);
+ foreach ($managers as $manager) {
+ $this->instantiate($manager);
}
}
}
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 46dd9b90c..9302f0c43 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -20,13 +20,15 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-$shortoptions = 'fi::';
-$longoptions = array('id::', 'foreground');
+$shortoptions = 'fi::a';
+$longoptions = array('id::', 'foreground', 'all');
$helptext = <<<END_OF_XMPP_HELP
Daemon script for receiving new notices from Jabber users.
-i --id Identity (default none)
+ -a --all Handle XMPP for all local sites
+ (requires Stomp queue handler, status_network setup)
-f --foreground Stay in the foreground (default background)
END_OF_XMPP_HELP;
@@ -37,13 +39,16 @@ require_once INSTALLDIR . '/lib/jabber.php';
class XMPPDaemon extends SpawningDaemon
{
- function __construct($id=null, $daemonize=true, $threads=1)
+ protected $allsites = false;
+
+ function __construct($id=null, $daemonize=true, $threads=1, $allsites=false)
{
if ($threads != 1) {
// This should never happen. :)
throw new Exception("XMPPDaemon can must run single-threaded");
}
parent::__construct($id, $daemonize, $threads);
+ $this->allsites = $allsites;
}
function runThread()
@@ -51,7 +56,7 @@ class XMPPDaemon extends SpawningDaemon
common_log(LOG_INFO, 'Waiting to listen to XMPP and queues');
$master = new XmppMaster($this->get_id());
- $master->init();
+ $master->init($this->allsites);
$master->service();
common_log(LOG_INFO, 'terminating normally');
@@ -69,15 +74,19 @@ class XmppMaster extends IoMaster
*/
function initManagers()
{
- // @fixme right now there's a hack in QueueManager to determine
- // which queues to subscribe to based on the master class.
- $this->instantiate('QueueManager');
- $this->instantiate('XmppManager');
+ if (common_config('xmpp', 'enabled')) {
+ $qm = QueueManager::get();
+ $qm->setActiveGroup('xmpp');
+ $this->instantiate($qm);
+ $this->instantiate(XmppManager::get());
+ }
}
}
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
+// @fixme do this check after we've run through the site list so we
+// don't have to find an XMPP site to start up when using --all mode.
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
@@ -92,7 +101,8 @@ if (have_option('i', 'id')) {
}
$foreground = have_option('f', 'foreground');
+$all = have_option('a') || have_option('--all');
-$daemon = new XMPPDaemon($id, !$foreground);
+$daemon = new XMPPDaemon($id, !$foreground, 1, $all);
$daemon->runOnce();