[docker] be resilient to dockerpy buggy api calls

tests/checks/mock/test_docker.py

@@ -0,0 +1,26 @@
+# (C) Datadog, Inc. 2010-2016
+# All rights reserved
+# Licensed under Simplified BSD License (see LICENSE)
+# stdlib
+import mock
+import unittest
+
+from utils.dockerutil import DockerUtil
+
+
+class TestDockerutil(unittest.TestCase):
+    def setUp(self):
+        self.dockerutil = DockerUtil()
+
+    @mock.patch('utils.dockerutil.DockerUtil.client')
+    def test_get_events(self, mocked_client):
+        mocked_client.events.return_value = [
+            {'status': 'stop', 'id': '1234567890', 'from': '1234567890', 'time': 1423247867}
+        ]
+        events_generator, _ = self.dockerutil.get_events()
+        self.assertEqual(len(events_generator), 1)
+
+        # bug in dockerpy, we should be resilient
+        mocked_client.events.return_value = [u'an error from Docker API here']
+        events_generator, _ = self.dockerutil.get_events()
+        self.assertEqual(len(list(events_generator)), 0)

utils/dockerutil.py

@@ -27,13 +27,14 @@ class MountException(Exception):
 log = logging.getLogger(__name__)
 
 
-class DockerUtil():
+class DockerUtil:
     __metaclass__ = Singleton
 
     DEFAULT_SETTINGS = {"version": DEFAULT_VERSION}
 
     def __init__(self, **kwargs):
         self._docker_root = None
+        self.events = []
 
         if 'init_config' in kwargs and 'instance' in kwargs:
             init_config = kwargs.get('init_config')
@@ -96,11 +97,14 @@ def get_events(self):
                                              until=now, decode=True)
         self._latest_event_collection_ts = now
         for event in event_generator:
-            if event != '':
+            try:
+                if event.get('status') in CONFIG_RELOAD_STATUS:
+                    should_reload_conf = True
                 self.events.append(event)
-            if event.get('status') in CONFIG_RELOAD_STATUS:
-                should_reload_conf = True
-        return (self.events, should_reload_conf)
+            except AttributeError:
+                log.debug('Unable to parse Docker event: %s', event)
+
+        return self.events, should_reload_conf
 
     def get_hostname(self):
         """Return the `Name` param from `docker info` to use as the hostname"""