Merge pull request #42 from docker/prevent_retrying_on_401

TUT-974 Prevent retrying on 401

Author: Feng Honglin

haproxy/eventhandler.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import time
 
 import dockercloud
 from compose.cli.docker_client import docker_client
@@ -52,12 +53,23 @@ def on_user_reload(signum, frame):
         run_haproxy("User reload")
 
 
+def on_cloud_error(e):
+    if isinstance(e, KeyboardInterrupt):
+        exit(0)
+
+
 def listen_dockercloud_events():
     events = dockercloud.Events()
     events.on_open(on_websocket_open)
     events.on_close(on_websocket_close)
     events.on_message(on_cloud_event)
-    events.run_forever()
+    events.on_error(on_cloud_error)
+    while True:
+        try:
+            events.run_forever()
+        except dockercloud.AuthError as e:
+            logger.info("Auth error: %s, retry in 1 hour" % e)
+            time.sleep(3600)
 
 
 def listen_docker_events():

haproxy/haproxycfg.py

@@ -64,11 +64,14 @@ def _initialize(link_mode):
     @staticmethod
     def _init_cloud_links():
         haproxy_container = fetch_remote_obj(HAPROXY_CONTAINER_URI)
-        links = CloudLinkHelper.get_cloud_links(haproxy_container)
-        Haproxy.cls_linked_services = CloudLinkHelper.get_linked_services(links)
-        logger.info("Linked service: %s", ", ".join(CloudLinkHelper.get_service_links_str(links)))
-        logger.info("Linked container: %s", ", ".join(CloudLinkHelper.get_container_links_str(links)))
-        return links
+        if haproxy_container:
+            links = CloudLinkHelper.get_cloud_links(haproxy_container)
+            Haproxy.cls_linked_services = CloudLinkHelper.get_linked_services(links)
+            logger.info("Linked service: %s", ", ".join(CloudLinkHelper.get_service_links_str(links)))
+            logger.info("Linked container: %s", ", ".join(CloudLinkHelper.get_container_links_str(links)))
+            return links
+        else:
+            return {}
 
     @staticmethod
     def _init_new_links():

haproxy/utils.py

@@ -7,17 +7,27 @@
 
 logger = logging.getLogger("haproxy")
 
+invalid_auth_headers = set()
+
 
 def fetch_remote_obj(uri):
     if not uri:
         return None
 
+    auth_header = str(dockercloud.auth.get_auth_header())
     while True:
         try:
+            if auth_header in invalid_auth_headers:
+                logger.info("Using know invalid credentials")
+                return None
             obj = dockercloud.Utils.fetch_by_resource_uri(uri)
             return obj
+        except dockercloud.AuthError as e:
+            invalid_auth_headers.add(auth_header)
+            logger.info(e)
+            return None
         except Exception as e:
-            logger.error(e)
+            logger.info(e)
             time.sleep(config.API_RETRY)