diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-10 11:56:51 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-10 11:56:51 -0800 |
commit | 54ff17010b145f5262fa57b6367b22ca02deb343 (patch) | |
tree | 6fb317e31850a9a070f2077ceb4b098e8930547a /scripts/queuedaemon.php | |
parent | 69b2f19b6fef793aa607c6d8f4590b93e2565626 (diff) | |
parent | 532e486a936c78961ff93d5e8de2dc0b86ee8d2a (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'scripts/queuedaemon.php')
-rwxr-xr-x | scripts/queuedaemon.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index 6dba16f95..582a3dd88 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -105,7 +105,7 @@ class QueueDaemon extends SpawningDaemon { $this->log(LOG_INFO, 'checking for queued notices'); - $master = new QueueMaster($this->get_id()); + $master = new QueueMaster($this->get_id(), $this->processManager()); $master->init($this->allsites); try { $master->service(); @@ -125,6 +125,14 @@ class QueueDaemon extends SpawningDaemon class QueueMaster extends IoMaster { + protected $processManager; + + function __construct($id, $processManager) + { + parent::__construct($id); + $this->processManager = $processManager; + } + /** * Initialize IoManagers which are appropriate to this instance. */ @@ -135,6 +143,7 @@ class QueueMaster extends IoMaster $qm = QueueManager::get(); $qm->setActiveGroup('main'); $managers[] = $qm; + $managers[] = $this->processManager; } Event::handle('EndQueueDaemonIoManagers', array(&$managers)); |