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

variable name conflict on reconnect 

darcs-hash:20080902172039-84dde-2b1bbac407959af2a5ca0c764aa503f0cb05c785.gz
This commit is contained in:
Evan Prodromou 2008-09-02 13:20:39 -04:00
parent 65e462858e
commit 307b9527e6
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extlib/XMPPHP/XMLStream.php
View File

@ -156,7 +156,7 @@ class XMPPHP_XMLStream {
/** /**
* @var integer * @var integer
*/ */
protected $reconnect = 30; protected $reconnectTimeout = 30;
/** /**
* Constructor * Constructor
@ -296,14 +296,14 @@ class XMPPHP_XMLStream {
*/ */
public function doReconnect() { public function doReconnect() {
if(!$this->is_server) { if(!$this->is_server) {
$this->log->log("Reconnecting ($this->reconnect)...", XMPPHP_Log::LEVEL_WARNING); $this->log->log("Reconnecting ($this->reconnectTimeout)...", XMPPHP_Log::LEVEL_WARNING);
$this->connect($this->reconnect, false, false); $this->connect($this->reconnectTimeout, false, false);
$this->reset(); $this->reset();
$this->event('reconnect'); $this->event('reconnect');
} }
} }
public function reconnectTimeout($timeout) { public function setReconnectTimeout($timeout) {
$this->reconnect = $timeout; $this->reconnect = $timeout;
} }

2
scripts/publicqueuehandler.php
View File

@ -47,7 +47,7 @@ class PublicQueueHandler extends QueueHandler {
if ($this->conn) { if ($this->conn) {
$this->conn->addEventHandler('message', 'forward_message', $this); $this->conn->addEventHandler('message', 'forward_message', $this);
$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
$this->conn->reconnectTimeout(600); $this->conn->setReconnectTimeout(600);
jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1); jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
} }
return !is_null($this->conn); return !is_null($this->conn);

2
scripts/xmppconfirmhandler.php
View File

@ -52,7 +52,7 @@ class XmppConfirmHandler {
if ($this->conn) { if ($this->conn) {
$this->conn->addEventHandler('message', 'forward_message', $this); $this->conn->addEventHandler('message', 'forward_message', $this);
$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
$this->conn->reconnectTimeout(600); $this->conn->setReconnectTimeout(600);
jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1); jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
} }
return !is_null($this->conn); return !is_null($this->conn);

2
scripts/xmppdaemon.php
View File

@ -67,7 +67,7 @@ class XMPPDaemon {
return false; return false;
} }
$this->conn->reconnectTimeout(600); $this->conn->setReconnectTimeout(600);
jabber_send_presence("Send me a message to post a notice", 'available', jabber_send_presence("Send me a message to post a notice", 'available',
NULL, 'available', 100); NULL, 'available', 100);

2
scripts/xmppqueuehandler.php
View File

@ -46,7 +46,7 @@ class XmppQueueHandler extends QueueHandler {
# Low priority; we don't want to receive messages # Low priority; we don't want to receive messages
$this->conn = jabber_connect($this->_id); $this->conn = jabber_connect($this->_id);
if ($this->conn) { if ($this->conn) {
$this->conn->reconnectTimeout(600); $this->conn->setReconnectTimeout(600);
$this->conn->addEventHandler('message', 'forward_message', $this); $this->conn->addEventHandler('message', 'forward_message', $this);
$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1); jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);