Merge pull request #31 from docker/force_user_reload

force reload the haproxy on USR1 signal

Author: Feng Honglin

README.md

@@ -436,5 +436,3 @@ In most cases, `dockercloud/haproxy` will configure itself automatically when th
 
 * `docker exec <haproxy_id> /reload.sh`, if you are on the node where dockercloud/haproxy deploys
 * `docker-cloud exec <haproxy_uuid> /reload.sh`, if you use docker-cloud cli
-
-Note: when `reload.sh` is invoked, it doesn't necessarily mean that HAProxy will be restarted. In fact, `dockercloud/haproxy` will try to get the current information of the the service and calculate a new configuration. HAProxy will only be restarted when the newly generated configuration differs from the current one.

haproxy/eventhandler.py

@@ -45,7 +45,11 @@ def on_websocket_close():
 
 
 def on_user_reload(signum, frame):
-    run_haproxy("User reload")
+    Haproxy.cls_cfg = None
+    if config.LINK_MODE == "legacy":
+        logger.info("User reload is not supported in legacy link mode")
+    else:
+        run_haproxy("User reload")
 
 
 def listen_dockercloud_events():