0e852def6a
Queue handlers for XMPP individual & firehose output now send their XML stanzas to another output queue instead of connecting directly to the chat server. This lets us have as many general processing threads as we need, while all actual XMPP input and output go through a single daemon with a single connection open. This avoids problems with multiple connected resources: * multiple windows shown in some chat clients (psi, gajim, kopete) * extra load on server * incoming message delivery forwarding issues Database changes: * queue_item drops 'notice_id' in favor of a 'frame' blob. This is based on Craig Andrews' work branch to generalize queues to take any object, but conservatively leaving out the serialization for now. Table updater (preserves any existing queued items) in db/rc3to09.sql Code changes to watch out for: * Queue handlers should now define a handle() method instead of handle_notice() * QueueDaemon and XmppDaemon now share common i/o (IoMaster) and respawning thread management (RespawningDaemon) infrastructure. * The polling XmppConfirmManager has been dropped, as the message is queued directly when saving IM settings. * Enable $config['queue']['debug_memory'] to output current memory usage at each run through the event loop to watch for memory leaks To do: * Adapt XMPP i/o to component connection mode for multi-site support. * XMPP input can also be broken out to a queue, which would allow the actual notice save etc to be handled by general queue threads. * Make sure there are no problems with simply pushing serialized Notice objects to queues. * Find a way to improve interactive performance of the database-backed queue handler; polling is pretty painful to XMPP. * Possibly redo the way QueueHandlers are injected into a QueueManager. The grouping used to split out the XMPP output queue is a bit awkward.
99 lines
2.8 KiB
PHP
Executable File
99 lines
2.8 KiB
PHP
Executable File
#!/usr/bin/env php
|
|
<?php
|
|
/*
|
|
* StatusNet - the distributed open-source microblogging tool
|
|
* Copyright (C) 2008, 2009, StatusNet, Inc.
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Affero General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
|
|
|
$shortoptions = 'fi::';
|
|
$longoptions = array('id::', 'foreground');
|
|
|
|
$helptext = <<<END_OF_XMPP_HELP
|
|
Daemon script for receiving new notices from Jabber users.
|
|
|
|
-i --id Identity (default none)
|
|
-f --foreground Stay in the foreground (default background)
|
|
|
|
END_OF_XMPP_HELP;
|
|
|
|
require_once INSTALLDIR.'/scripts/commandline.inc';
|
|
|
|
require_once INSTALLDIR . '/lib/jabber.php';
|
|
|
|
class XMPPDaemon extends SpawningDaemon
|
|
{
|
|
function __construct($id=null, $daemonize=true, $threads=1)
|
|
{
|
|
if ($threads != 1) {
|
|
// This should never happen. :)
|
|
throw new Exception("XMPPDaemon can must run single-threaded");
|
|
}
|
|
parent::__construct($id, $daemonize, $threads);
|
|
}
|
|
|
|
function runThread()
|
|
{
|
|
common_log(LOG_INFO, 'Waiting to listen to XMPP and queues');
|
|
|
|
$master = new XmppMaster($this->get_id());
|
|
$master->init();
|
|
$master->service();
|
|
|
|
common_log(LOG_INFO, 'terminating normally');
|
|
|
|
return true;
|
|
}
|
|
|
|
}
|
|
|
|
class XmppMaster extends IoMaster
|
|
{
|
|
/**
|
|
* Initialize IoManagers for the currently configured site
|
|
* which are appropriate to this instance.
|
|
*/
|
|
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');
|
|
}
|
|
}
|
|
|
|
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
|
|
// lots of CPU trying to connect to unconfigured servers
|
|
if (common_config('xmpp','enabled')==false) {
|
|
print "Aborting daemon - xmpp is disabled\n";
|
|
exit();
|
|
}
|
|
|
|
if (have_option('i', 'id')) {
|
|
$id = get_option_value('i', 'id');
|
|
} else if (count($args) > 0) {
|
|
$id = $args[0];
|
|
} else {
|
|
$id = null;
|
|
}
|
|
|
|
$foreground = have_option('f', 'foreground');
|
|
|
|
$daemon = new XMPPDaemon($id, !$foreground);
|
|
|
|
$daemon->runOnce();
|