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

set the reconnect timeout 

darcs-hash:20080902171740-84dde-ee629f4b5dbcf712cd350c37d0f1814ca1b7f237.gz
This commit is contained in:
Evan Prodromou 2008-09-02 13:17:40 -04:00
parent af8e38aeff
commit 65e462858e
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extlib/XMPPHP/XMLStream.php
View File

@ -153,6 +153,10 @@ class XMPPHP_XMLStream {
* @var boolean * @var boolean
*/ */
protected $use_ssl = false; protected $use_ssl = false;
/**
* @var integer
*/
protected $reconnect = 30;
/** /**
* Constructor * Constructor
@ -274,6 +278,8 @@ class XMPPHP_XMLStream {
if(!$this->socket) { if(!$this->socket) {
$this->log->log("Could not connect.", XMPPHP_Log::LEVEL_ERROR); $this->log->log("Could not connect.", XMPPHP_Log::LEVEL_ERROR);
$this->disconnected = true; $this->disconnected = true;
# Take it easy for a few seconds
sleep(min($timeout, 5));
} }
} while (!$this->socket && (time() - $starttime) < $timeout); } while (!$this->socket && (time() - $starttime) < $timeout);
@ -290,13 +296,17 @@ class XMPPHP_XMLStream {
*/ */
public function doReconnect() { public function doReconnect() {
if(!$this->is_server) { if(!$this->is_server) {
$this->log->log("Reconnecting...", XMPPHP_Log::LEVEL_WARNING); $this->log->log("Reconnecting ($this->reconnect)...", XMPPHP_Log::LEVEL_WARNING);
$this->connect(30, false, false); $this->connect($this->reconnect, false, false);
$this->reset(); $this->reset();
$this->event('reconnect'); $this->event('reconnect');
} }
} }
public function reconnectTimeout($timeout) {
$this->reconnect = $timeout;
}
/** /**
* Disconnect from XMPP Host * Disconnect from XMPP Host
*/ */

1
scripts/publicqueuehandler.php
View File

@ -47,6 +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);
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);

1
scripts/xmppconfirmhandler.php
View File

@ -52,6 +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);
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);

4
scripts/xmppdaemon.php
View File

@ -66,7 +66,9 @@ class XMPPDaemon {
if (!$this->conn) { if (!$this->conn) {
return false; return false;
} }
$this->conn->reconnectTimeout(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);
return !$this->conn->isDisconnected(); return !$this->conn->isDisconnected();

1
scripts/xmppqueuehandler.php
View File

@ -46,6 +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->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);