Merge branch 'develop' into feature/issue-1017-add-event-exporting

vumi/transports/xmpp/tests/test_xmpp.py

@@ -3,6 +3,7 @@
 from twisted.words.xish import domish
 
 from vumi.tests.helpers import VumiTestCase
+from vumi.tests.utils import LogCatcher
 from vumi.transports.xmpp.xmpp import (
     XMPPTransport, XMPPClient, XMPPTransportProtocol)
 from vumi.transports.tests.helpers import TransportHelper
@@ -197,3 +198,16 @@ def test_normalizing_from_addr(self):
         [msg] = yield self.tx_helper.wait_for_dispatched_inbound()
         self.assertEqual(msg['from_addr'], 'test@case.com')
         self.assertEqual(msg['transport_metadata']['xmpp_id'], message['id'])
+
+    @inlineCallbacks
+    def test_xmpp_connection_lost(self):
+        '''When the XMPP connection is lost, the connection callback should
+        be called, which should log that the connection was lost.'''
+        transport = yield self.mk_transport()
+
+        with LogCatcher() as lc:
+            yield transport.xmpp_protocol.connectionLost('Test connection')
+
+        [log] = lc.logs
+        self.assertEqual(
+            log['log_text'], 'XMPP Connection lost. Test connection')

vumi/transports/xmpp/xmpp.py

@@ -90,7 +90,6 @@ def connectionMade(self):
     def connectionLost(self, reason):
         if self.connection_lost_callback is not None:
             self.connection_lost_callback(reason)
-        self.log.msg("XMPP Connection lost.")
         super(XMPPTransportProtocol, self).connectionLost(reason)
 
 
@@ -170,11 +169,15 @@ def setup_transport(self):
         roster.setHandlerParent(self.xmpp_client)
 
         self.xmpp_protocol = self._xmpp_protocol(
-            self.jid, self.publish_message, self.unpause_connectors)
+            self.jid, self.publish_message, self.unpause_connectors,
+            connection_lost_callback=self.connection_lost)
         self.xmpp_protocol.setHandlerParent(self.xmpp_client)
 
         self.log.msg("XMPPTransport %s started." % self.transport_name)
 
+    def connection_lost(self, reason):
+        self.log.msg("XMPP Connection lost. %s" % reason)
+
     def announce_presence(self):
         if not self.presence_call.running:
             self.presence_call.start(self.presence_interval)