eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 0.9.x

Browse Source
This commit is contained in:
Evan Prodromou 2010-01-16 08:06:02 -08:00
commit 1f6bbc1890
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.php
View File

@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
//exit with 200 response, if this is checking fancy from the installer //exit with 200 response, if this is checking fancy from the installer
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
define('STATUSNET_VERSION', '0.9.0rc3'); define('STATUSNET_VERSION', '0.9.0beta3');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'Stand'); define('STATUSNET_CODENAME', 'Stand');

22
lib/queuemanager.php
View File

@ -149,11 +149,13 @@ abstract class QueueManager extends IoManager
function initialize() function initialize()
{ {
if (Event::handle('StartInitializeQueueManager', array($this))) { if (Event::handle('StartInitializeQueueManager', array($this))) {
$this->connect('plugin', 'PluginQueueHandler'); if (!defined('XMPP_ONLY_FLAG')) { // hack!
$this->connect('omb', 'OmbQueueHandler'); $this->connect('plugin', 'PluginQueueHandler');
$this->connect('ping', 'PingQueueHandler'); $this->connect('omb', 'OmbQueueHandler');
if (common_config('sms', 'enabled')) { $this->connect('ping', 'PingQueueHandler');
$this->connect('sms', 'SmsQueueHandler'); if (common_config('sms', 'enabled')) {
$this->connect('sms', 'SmsQueueHandler');
}
} }
// XMPP output handlers... // XMPP output handlers...
@ -165,10 +167,14 @@ abstract class QueueManager extends IoManager
$this->connect('confirm', 'XmppConfirmHandler'); $this->connect('confirm', 'XmppConfirmHandler');
} }
// For compat with old plugins not registering their own handlers. if (!defined('XMPP_ONLY_FLAG')) { // hack!
$this->connect('plugin', 'PluginQueueHandler'); // For compat with old plugins not registering their own handlers.
$this->connect('plugin', 'PluginQueueHandler');
}
}
if (!defined('XMPP_ONLY_FLAG')) { // hack!
Event::handle('EndInitializeQueueManager', array($this));
} }
Event::handle('EndInitializeQueueManager', array($this));
} }
/** /**

7
lib/stompqueuemanager.php
View File

@ -104,7 +104,12 @@ class StompQueueManager extends QueueManager
*/ */
function getQueues() function getQueues()
{ {
return array_keys($this->handlers[common_config('site', 'server')]); $site = common_config('site', 'server');
if (empty($this->handlers[$site])) {
return array();
} else {
return array_keys($this->handlers[$site]);
}
} }
/** /**

5
scripts/queuedaemon.php
View File

@ -21,7 +21,7 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'fi:at:'; $shortoptions = 'fi:at:';
$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp'); $longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only');
/** /**
* Attempts to get a count of the processors available on the current system * Attempts to get a count of the processors available on the current system
@ -263,6 +263,9 @@ $all = have_option('a') || have_option('--all');
if (have_option('--skip-xmpp')) { if (have_option('--skip-xmpp')) {
define('XMPP_EMERGENCY_FLAG', true); define('XMPP_EMERGENCY_FLAG', true);
} }
if (have_option('--xmpp-only')) {
define('XMPP_ONLY_FLAG', true);
}
$daemon = new QueueDaemon($id, $daemonize, $threads, $all); $daemon = new QueueDaemon($id, $daemonize, $threads, $all);
$daemon->runOnce(); $daemon->runOnce();