Merge lp:~michael.nelson/conn-check/configs-no-assume-publisher-type into lp:~ubuntuone-hackers/conn-check/configs

[Michael Nelson]

Don't assume an oops publisher has a type key (additionally need to check for fallback_chain, but this is smallest unblocking change)

This is the smallest change I could manage to unblock our deployment CI, which is currently failing because I switched to use an oops fallback_chain instead of a list of publishers.

Here's the error which CI hits: https://pastebin.canonical.com/145554/

As per the docs, the issue is that we can no-longer assume an item in the publishers list is a single publisher with a 'type' key:

http://bazaar.launchpad.net/~canonical-ca-hackers/python-oops-dictconfig/trunk/view/head:/README#L97

This will unblock our deployment, but we still need a further change to iterate through the fallback_chain list of publishers, I assume.

[Kelvin Li (kelvin.li)]

lgtm

review: Approve

=== modified file 'conn_check_configs/django.py'
--- conn_check_configs/django.py	2015-10-21 09:33:24 +0000
+++ conn_check_configs/django.py	2015-12-07 03:54:49 +0000
@@ -82,7 +82,7 @@
 
     publishers = oopses.get('publishers', [])
     for publisher in publishers:
-        if publisher['type'] == 'amqp':
+        if publisher.get('type') == 'amqp':
             if ':' in publisher['host']:
                 host, port = publisher['host'].split(':')
             else: