slightly more robust connection code

darcs-hash:20080902030331-84dde-bb2db886d90623785f930bb7c5c3c406d407f808.gz

diff --git a/lib/jabber.php b/lib/jabber.php
index 3e74cbbb82d8601541a9ef35d5f8712ea1cfb266..68bd0d8d35a652fc08339838859b10aada55bae9 100644 (file)
--- 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;