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

xmppdaemon.php can stay in foreground

Browse Source
This commit is contained in:
Evan Prodromou 2009-06-28 16:13:08 -04:00
parent 2f8c656e1d
commit 47e1d2adb8
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/xmppdaemon.php
View File

@ -20,13 +20,14 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'i::'; $shortoptions = 'fi::';
$longoptions = array('id::'); $longoptions = array('id::', 'foreground');
$helptext = <<<END_OF_XMPP_HELP $helptext = <<<END_OF_XMPP_HELP
Daemon script for receiving new notices from Jabber users. Daemon script for receiving new notices from Jabber users.
-i --id Identity (default none) -i --id Identity (default none)
-f --foreground Stay in the foreground (default background)
END_OF_XMPP_HELP; END_OF_XMPP_HELP;
@ -42,8 +43,10 @@ require_once INSTALLDIR . '/lib/daemon.php';
class XMPPDaemon extends Daemon class XMPPDaemon extends Daemon
{ {
function XMPPDaemon($resource=null) function XMPPDaemon($resource=null, $daemonize=true)
{ {
parent::__construct($daemonize);
static $attrs = array('server', 'port', 'user', 'password', 'host'); static $attrs = array('server', 'port', 'user', 'password', 'host');
foreach ($attrs as $attr) foreach ($attrs as $attr)
@ -62,7 +65,6 @@ class XMPPDaemon extends Daemon
function connect() function connect()
{ {
$connect_to = ($this->host) ? $this->host : $this->server; $connect_to = ($this->host) ? $this->host : $this->server;
$this->log(LOG_INFO, "Connecting to $connect_to on port $this->port"); $this->log(LOG_INFO, "Connecting to $connect_to on port $this->port");
@ -323,16 +325,16 @@ if (common_config('xmpp','enabled')==false) {
exit(); exit();
} }
if (have_option('i')) { if (have_option('i', 'id')) {
$id = get_option_value('i'); $id = get_option_value('i', 'id');
} else if (have_option('--id')) {
$id = get_option_value('--id');
} else if (count($args) > 0) { } else if (count($args) > 0) {
$id = $args[0]; $id = $args[0];
} else { } else {
$id = null; $id = null;
} }
$daemon = new XMPPDaemon($id); $foreground = have_option('f', 'foreground');
$daemon = new XMPPDaemon($id, $foreground);
$daemon->runOnce(); $daemon->runOnce();