variable name conflict on reconnect
darcs-hash:20080902172039-84dde-2b1bbac407959af2a5ca0c764aa503f0cb05c785.gz
This commit is contained in:
parent
65e462858e
commit
307b9527e6
|
@ -156,7 +156,7 @@ class XMPPHP_XMLStream {
|
|||
/**
|
||||
* @var integer
|
||||
*/
|
||||
protected $reconnect = 30;
|
||||
protected $reconnectTimeout = 30;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
@ -296,14 +296,14 @@ class XMPPHP_XMLStream {
|
|||
*/
|
||||
public function doReconnect() {
|
||||
if(!$this->is_server) {
|
||||
$this->log->log("Reconnecting ($this->reconnect)...", XMPPHP_Log::LEVEL_WARNING);
|
||||
$this->connect($this->reconnect, false, false);
|
||||
$this->log->log("Reconnecting ($this->reconnectTimeout)...", XMPPHP_Log::LEVEL_WARNING);
|
||||
$this->connect($this->reconnectTimeout, false, false);
|
||||
$this->reset();
|
||||
$this->event('reconnect');
|
||||
}
|
||||
}
|
||||
|
||||
public function reconnectTimeout($timeout) {
|
||||
public function setReconnectTimeout($timeout) {
|
||||
$this->reconnect = $timeout;
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ class PublicQueueHandler extends QueueHandler {
|
|||
if ($this->conn) {
|
||||
$this->conn->addEventHandler('message', 'forward_message', $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);
|
||||
}
|
||||
return !is_null($this->conn);
|
||||
|
|
|
@ -52,7 +52,7 @@ class XmppConfirmHandler {
|
|||
if ($this->conn) {
|
||||
$this->conn->addEventHandler('message', 'forward_message', $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);
|
||||
}
|
||||
return !is_null($this->conn);
|
||||
|
|
|
@ -67,7 +67,7 @@ class XMPPDaemon {
|
|||
return false;
|
||||
}
|
||||
|
||||
$this->conn->reconnectTimeout(600);
|
||||
$this->conn->setReconnectTimeout(600);
|
||||
|
||||
jabber_send_presence("Send me a message to post a notice", 'available',
|
||||
NULL, 'available', 100);
|
||||
|
|
|
@ -46,7 +46,7 @@ class XmppQueueHandler extends QueueHandler {
|
|||
# Low priority; we don't want to receive messages
|
||||
$this->conn = jabber_connect($this->_id);
|
||||
if ($this->conn) {
|
||||
$this->conn->reconnectTimeout(600);
|
||||
$this->conn->setReconnectTimeout(600);
|
||||
$this->conn->addEventHandler('message', 'forward_message', $this);
|
||||
$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
|
||||
jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
|
||||
|
|
Loading…
Reference in New Issue
Block a user