Log twitter api failures in twitter transport

praekeltfoundation · Apr 1, 2014 · 5f6cef0 · 5f6cef0
1 parent f295327
commit 5f6cef0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/vumi/transports/twitter/tests/test_twitter.py b/vumi/transports/twitter/tests/test_twitter.py
@@ -342,10 +342,15 @@ def fail(*a, **kw):
 
         self.patch(self.client, 'statuses_update', fail)
 
-        msg = yield self.tx_helper.make_dispatch_outbound(
-            'hello', endpoint='tweet_endpoint')
-        [nack] = yield self.tx_helper.wait_for_dispatched_events(1)
+        with LogCatcher() as lc:
+            msg = yield self.tx_helper.make_dispatch_outbound(
+                'hello', endpoint='tweet_endpoint')
 
+            self.assertEqual(
+                [e['message'][0] for e in lc.errors],
+                ["'Outbound twitter message failed: :('"])
+
+        [nack] = yield self.tx_helper.wait_for_dispatched_events(1)
         self.assertEqual(nack['user_message_id'], msg['message_id'])
         self.assertEqual(nack['sent_message_id'], msg['message_id'])
         self.assertEqual(nack['nack_reason'], ':(')
@@ -375,10 +380,15 @@ def fail(*a, **kw):
 
         self.patch(self.client, 'direct_messages_new', fail)
 
-        msg = yield self.tx_helper.make_dispatch_outbound(
-            'hello', endpoint='dm_endpoint')
-        [nack] = yield self.tx_helper.wait_for_dispatched_events(1)
+        with LogCatcher() as lc:
+            msg = yield self.tx_helper.make_dispatch_outbound(
+                'hello', endpoint='dm_endpoint')
 
+            self.assertEqual(
+                [e['message'][0] for e in lc.errors],
+                ["'Outbound twitter message failed: :('"])
+
+        [nack] = yield self.tx_helper.wait_for_dispatched_events(1)
         self.assertEqual(nack['user_message_id'], msg['message_id'])
         self.assertEqual(nack['sent_message_id'], msg['message_id'])
         self.assertEqual(nack['nack_reason'], ':(')

diff --git a/vumi/transports/twitter/twitter.py b/vumi/transports/twitter/twitter.py
@@ -112,10 +112,13 @@ def handler(message):
                     user_message_id=message['message_id'],
                     sent_message_id=twitter_message['id_str'])
             except Exception, e:
+                reason = '%s' % (e,)
+                log.err('Outbound twitter message failed: %s' % (reason,))
+
                 yield self.publish_nack(
                     user_message_id=message['message_id'],
                     sent_message_id=message['message_id'],
-                    reason='%s' % (e,))
+                    reason=reason)
 
         return handler