summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extlib/XMPPHP/XMLStream.php14
-rwxr-xr-xscripts/publicqueuehandler.php1
-rwxr-xr-xscripts/xmppconfirmhandler.php1
-rwxr-xr-xscripts/xmppdaemon.php4
-rwxr-xr-xscripts/xmppqueuehandler.php1
5 files changed, 18 insertions, 3 deletions
diff --git a/extlib/XMPPHP/XMLStream.php b/extlib/XMPPHP/XMLStream.php
index e59e95902..b27811407 100644
--- a/extlib/XMPPHP/XMLStream.php
+++ b/extlib/XMPPHP/XMLStream.php
@@ -153,6 +153,10 @@ class XMPPHP_XMLStream {
* @var boolean
*/
protected $use_ssl = false;
+ /**
+ * @var integer
+ */
+ protected $reconnect = 30;
/**
* Constructor
@@ -274,6 +278,8 @@ class XMPPHP_XMLStream {
if(!$this->socket) {
$this->log->log("Could not connect.", XMPPHP_Log::LEVEL_ERROR);
$this->disconnected = true;
+ # Take it easy for a few seconds
+ sleep(min($timeout, 5));
}
} while (!$this->socket && (time() - $starttime) < $timeout);
@@ -290,13 +296,17 @@ class XMPPHP_XMLStream {
*/
public function doReconnect() {
if(!$this->is_server) {
- $this->log->log("Reconnecting...", XMPPHP_Log::LEVEL_WARNING);
- $this->connect(30, false, false);
+ $this->log->log("Reconnecting ($this->reconnect)...", XMPPHP_Log::LEVEL_WARNING);
+ $this->connect($this->reconnect, false, false);
$this->reset();
$this->event('reconnect');
}
}
+ public function reconnectTimeout($timeout) {
+ $this->reconnect = $timeout;
+ }
+
/**
* Disconnect from XMPP Host
*/
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 49e5f5b8f..366c1e5c3 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -47,6 +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);
jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
}
return !is_null($this->conn);
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 6cb44ce09..3b69d8e8f 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -52,6 +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);
jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
}
return !is_null($this->conn);
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 2372a17e6..3e866761c 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -66,7 +66,9 @@ class XMPPDaemon {
if (!$this->conn) {
return false;
}
-
+
+ $this->conn->reconnectTimeout(600);
+
jabber_send_presence("Send me a message to post a notice", 'available',
NULL, 'available', 100);
return !$this->conn->isDisconnected();
diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index c2c7a6502..80fb53381 100755
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -46,6 +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->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);