From 31f4794c12fabc6fff5d6305b1ef186ce63a9159 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Sat, 22 Jul 2017 00:42:37 +0000 Subject: [PATCH] Close stdout *after* binding ports Otherwise probe tests think services are up when they aren't actually available yet. Related-Change: I045f4c9aa2c07cdc5ed95afd028540f1b3874637 Change-Id: Iab923c4f48ac7a5dd41237761ed91d01a59dc77c --- swift/common/wsgi.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/swift/common/wsgi.py b/swift/common/wsgi.py index 009597c8b4..72eee0209e 100644 --- a/swift/common/wsgi.py +++ b/swift/common/wsgi.py @@ -902,9 +902,6 @@ def run_wsgi(conf_path, app_section, *args, **kwargs): utils.FALLOCATE_RESERVE, utils.FALLOCATE_IS_PERCENT = \ utils.config_fallocate_value(conf.get('fallocate_reserve', '1%')) - # redirect errors to logger and close stdio - capture_stdio(logger) - # Start listening on bind_addr/port error_msg = strategy.do_bind_ports() if error_msg: @@ -912,6 +909,10 @@ def run_wsgi(conf_path, app_section, *args, **kwargs): print(error_msg) return 1 + # Redirect errors to logger and close stdio. Do this *after* binding ports; + # we use this to signal that the service is ready to accept connections. + capture_stdio(logger) + no_fork_sock = strategy.no_fork_sock() if no_fork_sock: run_server(conf, logger, no_fork_sock, global_conf=global_conf)