summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@status.net>2010-11-12 13:32:48 -0800
committerBrion Vibber <brion@status.net>2010-11-12 13:32:48 -0800
commit65eeb7cba530e45b8d8a25644505619e8af63971 (patch)
treeff27dab0ad5a6d09720a181eadc7ab018ca8f140 /lib
parent5d12ec0532fa9bcc71644186f6ff80f2b527703c (diff)
parent6291e8201f90ed50687f7670edc505645ea55bfb (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts: actions/newgroup.php
Diffstat (limited to 'lib')
-rw-r--r--lib/xmppmanager.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 7acd7663a..238696664 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -198,10 +198,12 @@ class XmppManager extends IoManager
$this->conn->processTime(0);
return true;
} else {
+ common_log(LOG_ERR, __METHOD__ . ' failed: 0 bytes sent');
return false;
}
} else {
// Can't send right now...
+ common_log(LOG_ERR, __METHOD__ . ' failed: XMPP server connection currently down');
return false;
}
}