Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Commit

Permalink
fix the exception on user reload
Browse files Browse the repository at this point in the history
  • Loading branch information
tifayuki committed Jul 20, 2016
1 parent 47fbc7b commit c77417c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion haproxy/eventhandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions haproxy/main.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand All @@ -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)
Expand Down

0 comments on commit c77417c

Please sign in to comment.