From ab92ba78ba42397054254d785556df493067d962 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 1 Sep 2008 23:03:31 -0400 Subject: [PATCH] slightly more robust connection code darcs-hash:20080902030331-84dde-bb2db886d90623785f930bb7c5c3c406d407f808.gz --- lib/jabber.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/jabber.php b/lib/jabber.php index 3e74cbbb82..68bd0d8d35 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -57,16 +57,21 @@ function jabber_connect($resource=NULL) { common_config('xmpp', 'debug') ? XMPPHP_Log::LEVEL_VERBOSE : NULL ); - $conn->autoSubscribe(); - $conn->useEncryption(common_config('xmpp', 'encryption')); if (!$conn) { return false; } - $conn->connect(true); # true = persistent connection - if ($conn->isDisconnected()) { + + $conn->autoSubscribe(); + $conn->useEncryption(common_config('xmpp', 'encryption')); + + try { + $conn->connect(true); # true = persistent connection + } catch (XMPPHP_Exception $e) { + common_log(LOG_ERROR, $e->getMessage()); return false; } + $conn->processUntil('session_start'); } return $conn; -- 2.39.5