Merge branch 'staging'

Author: tifayuki

.gitignore

@@ -8,6 +8,7 @@ output
 
 # Packages
 *.egg
+*.eggs
 *.egg-info
 dist
 build
@@ -38,3 +39,4 @@ nosetests.xml
 .project
 .pydevproject
 .idea
+.DS_Store

Dockerfile

@@ -27,6 +27,5 @@ ENV RSYSLOG_DESTINATION=127.0.0.1 \
     SSL_BIND_CIPHERS="ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA" \
     HEALTH_CHECK="check"
 
-
 EXPOSE 80 443 1936
 CMD ["dockercloud-haproxy"]

README.md

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.2"

haproxy/__init__.py

@@ -0,0 +1,57 @@
+import os
+import re
+
+
+def parse_extra_bind_settings(extra_bind_settings):
+    bind_dict = {}
+    if extra_bind_settings:
+        settings = re.split(r'(?<!\\),', extra_bind_settings)
+        for setting in settings:
+            term = setting.split(":", 1)
+            if len(term) == 2:
+                bind_dict[term[0].strip().replace("\,", ",")] = term[1].strip().replace("\,", ",")
+    return bind_dict
+
+
+# envvar
+DEFAULT_SSL_CERT = os.getenv("DEFAULT_SSL_CERT") or os.getenv("SSL_CERT")
+EXTRA_SSL_CERT = os.getenv("EXTRA_SSL_CERTS")
+DEFAULT_CA_CERT = os.getenv("CA_CERT")
+MAXCONN = os.getenv("MAXCONN", "4096")
+MODE = os.getenv("MODE", "http")
+OPTION = os.getenv("OPTION", "redispatch, httplog, dontlognull, forwardfor")
+RSYSLOG_DESTINATION = os.getenv("RSYSLOG_DESTINATION", "127.0.0.1")
+SSL_BIND_CIPHERS = os.getenv("SSL_BIND_CIPHERS")
+SSL_BIND_OPTIONS = os.getenv("SSL_BIND_OPTIONS")
+STATS_AUTH = os.getenv("STATS_AUTH", "stats:stats")
+STATS_PORT = os.getenv("STATS_PORT", "1936")
+TIMEOUT = os.getenv("TIMEOUT", "connect 5000, client 50000, server 50000")
+HEALTH_CHECK = os.getenv("HEALTH_CHECK", "check inter 2000 rise 2 fall 3")
+EXTRA_GLOBAL_SETTINGS = os.getenv("EXTRA_GLOBAL_SETTINGS")
+EXTRA_DEFAULT_SETTINGS = os.getenv("EXTRA_DEFAULT_SETTINGS")
+EXTRA_BIND_SETTINGS = parse_extra_bind_settings(os.getenv("EXTRA_BIND_SETTINGS"))
+HTTP_BASIC_AUTH = os.getenv("HTTP_BASIC_AUTH")
+MONITOR_URI = os.getenv("MONITOR_URI")
+MONITOR_PORT = os.getenv("MONITOR_PORT")
+BALANCE = os.getenv("BALANCE", "roundrobin")
+HAPROXY_CONTAINER_URI = os.getenv("DOCKERCLOUD_CONTAINER_API_URI")
+HAPROXY_SERVICE_URI = os.getenv("DOCKERCLOUD_SERVICE_API_URI")
+API_AUTH = os.getenv("DOCKERCLOUD_AUTH")
+DEBUG = os.getenv("DEBUG", False)
+LINK_MODE = ""
+
+# const
+CERT_DIR = "/certs/"
+CACERT_DIR = "/cacerts/"
+HAPROXY_CONFIG_FILE = "/haproxy.cfg"
+HAPROXY_RUN_COMMAND = ['/usr/sbin/haproxy', '-f', HAPROXY_CONFIG_FILE, '-db', '-q']
+API_RETRY = 10  # seconds
+PID_FILE = "/tmp/dockercloud-haproxy.pid"
+
+# regular expressions
+SERVICE_NAME_MATCH = re.compile(r"(.+)_\d+$")
+BACKEND_MATCH = re.compile(r"(?P<proto>tcp|udp):\/\/(?P<addr>[^:]*):(?P<port>.*)")
+SERVICE_ALIAS_MATCH = re.compile(r"_PORT_\d{1,5}_(TCP|UDP)$")
+DETAILED_SERVICE_ALIAS_MATCH = re.compile(r"_\d+_PORT_\d{1,5}_(TCP|UDP)$")
+ENV_SERVICE_ALIAS_MATCH = re.compile(r"_ENV_")
+ENV_DETAILED_SERVICE_ALIAS_MATCH = re.compile(r"_\d+_ENV")

haproxy/config.py

@@ -0,0 +1,75 @@
+import json
+import logging
+
+import dockercloud
+from compose.cli.docker_client import docker_client
+from docker.errors import APIError
+
+import config
+import helper.cloud_link_helper
+from haproxycfg import run_haproxy, Haproxy
+from utils import get_uuid_from_resource_uri
+
+logger = logging.getLogger("haproxy")
+
+
+def on_cloud_event(message):
+    logger.debug(message)
+    logger.debug(Haproxy.cls_linked_services)
+    try:
+        event = json.loads(message)
+    except ValueError:
+        logger.info("event is not a valid json message")
+        return
+
+    # When service scale up/down or container start/stop/terminate/redeploy, reload the service
+    if event.get("state", "") not in ["In progress", "Pending", "Terminating", "Starting", "Scaling", "Stopping"] and \
+                    event.get("type", "").lower() in ["container", "service"] and \
+                    len(set(Haproxy.cls_linked_services).intersection(set(event.get("parents", [])))) > 0:
+        msg = "Docker Cloud Event: %s %s is %s" % (
+            event["type"], get_uuid_from_resource_uri(event.get("resource_uri", "")), event["state"].lower())
+        run_haproxy(msg)
+
+    # Add/remove services linked to haproxy
+    if event.get("state", "") == "Success" and config.HAPROXY_SERVICE_URI in event.get("parents", []):
+        run_haproxy("Docker Cloud Event: New action is executed on the Haproxy container")
+
+
+def on_websocket_open():
+    helper.cloud_link_helper.LINKED_CONTAINER_CACHE.clear()
+    run_haproxy("Websocket open")
+
+
+def on_websocket_close():
+    logger.info("Websocket close")
+
+
+def on_user_reload(signum, frame):
+    run_haproxy("User reload")
+
+
+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()
+
+
+def listen_docker_events():
+    try:
+        docker = docker_client()
+        docker.ping()
+        for event in docker.events(decode=True):
+            logger.debug(event)
+            attr = event.get("Actor", {}).get("Attributes")
+            compose_project = attr.get("com.docker.compose.project", "")
+            compose_service = attr.get("com.docker.compose.service", "")
+            container_name = attr.get("name", "")
+            event_action = event.get("Action", "")
+            service = "%s_%s" % (compose_project, compose_service)
+            if service in Haproxy.cls_linked_services and event_action in ["start", "die"]:
+                msg = "Docker event: container %s %s" % (container_name, event_action)
+                run_haproxy(msg)
+    except APIError as e:
+        logger.info("Docker API error: %s" % e)