GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

all daemons take an id parameter

This commit is contained in:
Evan Prodromou 2009-06-24 19:31:12 -07:00
parent a6c56d17e0
commit becfd6b3b5
5 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/xmppqueuehandler.php
View File

@ -30,12 +30,11 @@ require_once(INSTALLDIR.'/lib/queuehandler.php');
class XmppQueueHandler extends QueueHandler
{
function start()
{
# Low priority; we don't want to receive messages
$this->log(LOG_INFO, "INITIALIZE");
$this->conn = jabber_connect($this->_id);
$this->conn = jabber_connect($this->_id.$this->transport());
if ($this->conn) {
$this->conn->addEventHandler('message', 'forward_message', $this);
$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);

20
scripts/jabberqueuehandler.php
View File

@ -20,13 +20,13 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'r::';
$longoptions = array('resource::');
$shortoptions = 'i::';
$longoptions = array('id::');
$helptext = <<<END_OF_JABBER_HELP
Daemon script for pushing new notices to Jabber users.
-r --resource Jabber Resource ID (default to config)
-i --id Identity (default none)
END_OF_JABBER_HELP;
@ -63,16 +63,16 @@ if (common_config('xmpp','enabled')==false) {
exit();
}
if (have_option('r')) {
$resource = get_option_value('r');
} else if (have_option('--resource')) {
$resource = get_option_value('--resource');
if (have_option('i')) {
$id = get_option_value('i');
} else if (have_option('--id')) {
$id = get_option_value('--id');
} else if (count($args) > 0) {
$resource = $args[0];
$id = $args[0];
} else {
$resource = null;
$id = null;
}
$handler = new JabberQueueHandler($resource);
$handler = new JabberQueueHandler($id);
$handler->runOnce();

20
scripts/publicqueuehandler.php
View File

@ -20,13 +20,13 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'r::';
$longoptions = array('resource::');
$shortoptions = 'i::';
$longoptions = array('id::');
$helptext = <<<END_OF_PUBLIC_HELP
Daemon script for pushing new notices to public XMPP subscribers.
-r --resource Jabber Resource ID
-i --id Identity (default none)
END_OF_PUBLIC_HELP;
@ -61,16 +61,16 @@ if (common_config('xmpp','enabled')==false) {
exit();
}
if (have_option('r')) {
$resource = get_option_value('r');
} else if (have_option('--resource')) {
$resource = get_option_value('--resource');
if (have_option('i')) {
$id = get_option_value('i');
} else if (have_option('--id')) {
$id = get_option_value('--id');
} else if (count($args) > 0) {
$resource = $args[0];
$id = $args[0];
} else {
$resource = null;
$id = null;
}
$handler = new PublicQueueHandler($resource);
$handler = new PublicQueueHandler($id);
$handler->runOnce();

20
scripts/xmppconfirmhandler.php
View File

@ -20,13 +20,13 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'r::';
$longoptions = array('resource::');
$shortoptions = 'i::';
$longoptions = array('id::');
$helptext = <<<END_OF_JABBER_HELP
Daemon script for pushing new confirmations to Jabber users.
-r --resource Jabber Resource ID (default to config)
-i --id Identity (default none)
END_OF_JABBER_HELP;
@ -147,17 +147,17 @@ if (common_config('xmpp','enabled')==false) {
exit();
}
if (have_option('r')) {
$resource = get_option_value('r');
} else if (have_option('--resource')) {
$resource = get_option_value('--resource');
if (have_option('i')) {
$id = get_option_value('i');
} else if (have_option('--id')) {
$id = get_option_value('--id');
} else if (count($args) > 0) {
$resource = $args[0];
$id = $args[0];
} else {
$resource = null;
$id = null;
}
$handler = new XmppConfirmHandler($resource);
$handler = new XmppConfirmHandler($id);
$handler->runOnce();

22
scripts/xmppdaemon.php
View File

@ -20,13 +20,13 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'r::';
$longoptions = array('resource::');
$shortoptions = 'i::';
$longoptions = array('id::');
$helptext = <<<END_OF_XMPP_HELP
Daemon script for receiving new notices from Jabber users.
-r --resource Jabber Resource ID (default to config)
-i --id Identity (default none)
END_OF_XMPP_HELP;
@ -52,7 +52,7 @@ class XMPPDaemon extends Daemon
}
if ($resource) {
$this->resource = $resource;
$this->resource = $resource . 'daemon';
} else {
$this->resource = common_config('xmpp', 'resource') . 'daemon';
}
@ -323,16 +323,16 @@ if (common_config('xmpp','enabled')==false) {
exit();
}
if (have_option('r')) {
$resource = get_option_value('r');
} else if (have_option('--resource')) {
$resource = get_option_value('--resource');
if (have_option('i')) {
$id = get_option_value('i');
} else if (have_option('--id')) {
$id = get_option_value('--id');
} else if (count($args) > 0) {
$resource = $args[0];
$id = $args[0];
} else {
$resource = null;
$id = null;
}
$daemon = new XMPPDaemon($resource);
$daemon = new XMPPDaemon($id);
$daemon->runOnce();