better connection handling in scripts

darcs-hash:20080902165735-84dde-e522711214832e6f992b9897aaf8904b1d5c6a2e.gz

3 files changed, 19 insertions, 6 deletions

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index b482d029a..49e5f5b8f 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -42,8 +42,13 @@ class PublicQueueHandler extends QueueHandler {
 	function start() {
 		$this->log(LOG_INFO, "INITIALIZE");
 		# Low priority; we don't want to receive messages
-		$this->conn = jabber_connect($this->_id, NULL, -1);
-		$this->conn->addEventHandler('message', 'forward_message', $this);
+
+		$this->conn = jabber_connect($this->_id);
+		if ($this->conn) {
+			$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);
+		}
 		return !is_null($this->conn);
 	}
 
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index c63498f55..6cb44ce09 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -48,8 +48,12 @@ class XmppConfirmHandler {
 	function start() {
 		# Low priority; we don't want to receive messages
 		$this->log(LOG_INFO, "INITIALIZE");
-		$this->conn = jabber_connect($this->_id, NULL, -1);
-		$this->conn->addEventHandler('message', 'forward_message', $this);
+		$this->conn = jabber_connect($this->_id);
+		if ($this->conn) {
+			$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);
+		}
 		return !is_null($this->conn);
 	}
 	
diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index 49d3df0f5..c2c7a6502 100755
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -44,8 +44,12 @@ class XmppQueueHandler extends QueueHandler {
 	function start() {
 		$this->log(LOG_INFO, "INITIALIZE");
 		# Low priority; we don't want to receive messages
-		$this->conn = jabber_connect($this->_id, NULL, -1);
-		$this->conn->addEventHandler('message', 'forward_message', $this);
+		$this->conn = jabber_connect($this->_id);
+		if ($this->conn) {
+			$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);
+		}
 		return !is_null($this->conn);
 	}