diff options
Diffstat (limited to 'zuul/cmd/web.py')
| -rwxr-xr-x | zuul/cmd/web.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zuul/cmd/web.py b/zuul/cmd/web.py index b992e621c..fe4b2ca4f 100755 --- a/zuul/cmd/web.py +++ b/zuul/cmd/web.py @@ -86,6 +86,12 @@ class WebServer(zuul.cmd.ZuulDaemonApp): self.config, 'zookeeper', 'hosts', None) if not params["zk_hosts"]: raise Exception("The zookeeper hosts config value is required") + params["zk_tls_key"] = get_default(self.config, 'zookeeper', 'tls_key') + params["zk_tls_cert"] = get_default(self.config, + 'zookeeper', 'tls_cert') + params["zk_tls_ca"] = get_default(self.config, 'zookeeper', 'tls_ca') + params["zk_timeout"] = float(get_default(self.config, 'zookeeper', + 'session_timeout', 10.0)) try: self.web = zuul.web.ZuulWeb(**params) @@ -99,13 +105,7 @@ class WebServer(zuul.cmd.ZuulDaemonApp): self.log.info('Zuul Web Server starting') self.web.start() - try: - signal.pause() - except KeyboardInterrupt: - print("Ctrl + C: asking web server to exit nicely...\n") - self.exit_handler(signal.SIGINT, None) - - self.web.stop() + self.web.join() self.log.info("Zuul Web Server stopped") def configure_authenticators(self): |