diff options
| -rw-r--r-- | lib/jabber.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/jabber.php b/lib/jabber.php index 3e74cbbb8..68bd0d8d3 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; |