Merge "Ensure command_socket is last thing to close"

This commit is contained in:
Zuul 2019-01-09 14:43:50 +00:00 committed by Gerrit Code Review
commit 074ee6b7a7
3 changed files with 10 additions and 9 deletions

View File

@ -2320,7 +2320,6 @@ class ExecutorServer(object):
self._running = False
self._command_running = False
workers = list(self.job_workers.values())
self.command_socket.stop()
for job_worker in workers:
try:
@ -2351,6 +2350,7 @@ class ExecutorServer(object):
self.statsd.gauge(base_key + '.pct_used_ram', 0)
self.statsd.gauge(base_key + '.running_builds', 0)
self.command_socket.stop()
self.log.debug("Stopped")
def join(self):

View File

@ -184,13 +184,6 @@ class FingerGateway(object):
self.log.info("Finger gateway is started")
def stop(self):
if self.command_socket:
self.command_running = False
try:
self.command_socket.stop()
except Exception:
self.log.exception("Error stopping command socket:")
if self.server:
try:
self.server.shutdown()
@ -206,6 +199,14 @@ class FingerGateway(object):
except Exception:
self.log.exception("Error stopping RCP client:")
if self.command_socket:
self.command_running = False
try:
self.command_socket.stop()
except Exception:
self.log.exception("Error stopping command socket:")
self.log.info("Finger gateway is stopped")
def wait(self):

View File

@ -87,8 +87,8 @@ class MergeServer(object):
self.log.debug("Stopping")
self._running = False
self._command_running = False
self.command_socket.stop()
self.worker.shutdown()
self.command_socket.stop()
self.log.debug("Stopped")
def join(self):