From b39f8840d68992b9c3a392b4b3b21519d9bffc7b Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Thu, 21 Nov 2013 13:12:00 +1100 Subject: [PATCH] Make sure we wait for a gearman server Change-Id: I4cc5f5b6fb50a77116aeede4a450bd8281a5a5a9 --- turbo_hipster/worker_manager.py | 3 ++- turbo_hipster/worker_server.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/turbo_hipster/worker_manager.py b/turbo_hipster/worker_manager.py index 8c8150f..bcd601c 100644 --- a/turbo_hipster/worker_manager.py +++ b/turbo_hipster/worker_manager.py @@ -112,12 +112,13 @@ class ZuulClient(threading.Thread): self.global_config['zuul_server']['gearman_host'], self.global_config['zuul_server']['gearman_port'] ) - self.register_functions() + self.gearman_worker.waitForServer() def register_functions(self): self.log.debug("Register functions with gearman") for function_name, plugin in self.functions.items(): self.gearman_worker.registerFunction(function_name) + self.log.debug(self.gearman_worker.functions) def add_function(self, function_name, plugin): self.log.debug("Add function, %s, to list" % function_name) diff --git a/turbo_hipster/worker_server.py b/turbo_hipster/worker_server.py index 5cca261..a87c7bc 100755 --- a/turbo_hipster/worker_server.py +++ b/turbo_hipster/worker_server.py @@ -48,6 +48,9 @@ class Server(object): self.zuul_manager = None self.zuul_client = None self.plugins = [] + + # TODO: Make me unique (random?) and we should be able to run multiple + # instances of turbo-hipster on the one host self.worker_name = os.uname()[1] self.tasks = {}