forked from GNUsocial/gnu-social
Stomp queue restructuring for mass scalability:
- Multiplexing queues into groups and for multiple sites. - Sharing vs breakout configurable per site and per queue via $config['queue']['breakout'] - Detect how many times a message is redelivered, discard if it's killed too many daemons - count configurable with $config['queue']['max_retries'] - can dump the items to files in $config['queue']['dead_letter_dir'] Queue daemon memory & resource leak fixes: - avoid unnecessary reconnections to memcached server (switch persistent connections back in on second initialization, assuming it's child process) - monkey-patch for leaky .ini loads in DB_DataObject::databaseStructure() - was leaking 200k per active switch - applied leak fixes to Status_network as well, using intermediate base Safe_DataObject for both it and Memcache_DataObject Misc queue fixes: - correct handling of child processes exiting due to signal termination instead of regular exit - shutdown instead of infinite respawn loop if we're already past the soft memory limit at startup - Added --all option for xmppdaemon... still opens one xmpp connection per site that has xmpp active Cache updates: - add Cache::increment() method with native support for memcached atomic increment
This commit is contained in:
@@ -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();
|
||||
|
Reference in New Issue
Block a user