Merge pull request #89 from docker/staging

CLOUD-1189 fix the exception on user reload, fix #50

Author: Feng Honglin

haproxy/eventhandler.py

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

haproxy/main.py

@@ -1,7 +1,11 @@
+from gevent import monkey
+monkey.patch_all()
+
 import logging
 import os
-import signal
 import sys
+import signal
+import gevent
 
 import dockercloud
 from compose.cli.docker_client import docker_client
@@ -13,10 +17,6 @@
 from haproxycfg import run_haproxy
 from utils import save_to_file
 
-
-from gevent import monkey
-monkey.patch_all()
-
 dockercloud.user_agent = "dockercloud-haproxy/%s" % __version__
 
 logger = logging.getLogger("haproxy")
@@ -35,8 +35,8 @@ def main():
         logging.getLogger("python-dockercloud").setLevel(logging.DEBUG)
 
     config.LINK_MODE = check_link_mode(HAPROXY_CONTAINER_URI, HAPROXY_SERVICE_URI, API_AUTH)
-    signal.signal(signal.SIGUSR1, on_user_reload)
-    signal.signal(signal.SIGTERM, sys.exit)
+    gevent.signal(signal.SIGUSR1, on_user_reload)
+    gevent.signal(signal.SIGTERM, sys.exit)
 
     pid = create_pid_file()
     logger.info("dockercloud/haproxy PID: %s" % pid)