Merge pull request #209 from docker/staging

v1.6.7

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.6
 MAINTAINER Feng Honglin <[email protected]>
 
 COPY . /haproxy-src

haproxy/__init__.py

@@ -1 +1 @@
-__version__ = "1.6.6"
+__version__ = "1.6.7"

haproxy/config.py

@@ -129,6 +129,7 @@ def parse_additional_backend_settings(envvars):
 CACERT_DIR = "/cacerts/"
 HAPROXY_CONFIG_FILE = "/haproxy.cfg"
 HAPROXY_RUN_COMMAND = ['/usr/sbin/haproxy', '-f', HAPROXY_CONFIG_FILE, '-db', '-q']
+HAPROXY_CONFIG_CHECK_COMMAND = ['/usr/sbin/haproxy', '-c', '-f', HAPROXY_CONFIG_FILE]
 API_RETRY = 10  # seconds
 PID_FILE = "/tmp/dockercloud-haproxy.pid"
 SERVICE_PORTS_ENVVAR_NAME = "SERVICE_PORTS"

haproxy/helper/update_helper.py

@@ -1,9 +1,10 @@
+import errno
 import logging
 import subprocess
 import threading
 import time
 
-from haproxy.config import HAPROXY_RUN_COMMAND, RELOAD_TIMEOUT
+from haproxy.config import HAPROXY_RUN_COMMAND, RELOAD_TIMEOUT, HAPROXY_CONFIG_CHECK_COMMAND
 
 logger = logging.getLogger("haproxy")
 
@@ -21,7 +22,17 @@
 #
 def run_reload(old_process, timeout=int(RELOAD_TIMEOUT)):
     if old_process:
-        # Reload haproxy
+        # Config check
+        p = subprocess.Popen(HAPROXY_CONFIG_CHECK_COMMAND, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+        output, err = p.communicate()
+        if p.returncode != 0:
+            logger.error("Config check failed. NOT reloading haproxy: %s - %s" % (err, output))
+            return old_process
+        else:
+            logger.info("Config check passed")
+
+        # Reload Haproxy
         logger.info("Reloading HAProxy")
         if timeout == -1:
             flag = "-st"

tests/unit/helper/test_update_helper.py

@@ -25,9 +25,17 @@ def poll(self):
         def terminate(self):
             self.terminated = True
 
+        def communicate(self):
+            return ("", "")
+
         pass
 
     class Object(object):
+        returncode = 0
+
+        def communicate(self):
+            return ("", "")
+
         pass
 
     @mock.patch("haproxy.helper.update_helper.subprocess.Popen")