From 6e491e5356fac995a4ae91daed8bb5cf0ce9099d Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Fri, 9 Nov 2012 09:57:46 -0500 Subject: [PATCH] Tag worker log messages with prefix. Similar to the stats thread, the worker thread will now include a prefix on logging messages. This helps to identify messages from different threads. Change-Id: I4a8ca6fd68d1ccd414b21998ae25dee4cf7c8b8a --- libra/worker/worker.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libra/worker/worker.py b/libra/worker/worker.py index c93b80d9..8167bbac 100644 --- a/libra/worker/worker.py +++ b/libra/worker/worker.py @@ -38,7 +38,6 @@ def handler(worker, job): logger = worker.logger driver = worker.driver - logger.debug("Entered worker task") logger.debug("Received JSON message: %s" % json.dumps(job.data, indent=4)) controller = LBaaSController(logger, driver, job.data) @@ -51,7 +50,7 @@ def handler(worker, job): def config_manager(logger, driver, servers, reconnect_sleep): my_ip = socket.gethostbyname(socket.gethostname()) task_name = "lbaas-%s" % my_ip - logger.info("Registering task %s" % task_name) + logger.info("[worker] Registering task %s" % task_name) worker = CustomJSONGearmanWorker(servers) worker.set_client_id(my_ip) @@ -67,9 +66,11 @@ def config_manager(logger, driver, servers, reconnect_sleep): except KeyboardInterrupt: retry = False except gearman.errors.ServerUnavailable: - logger.error("Job server(s) went away. Reconnecting.") + logger.error("[worker] Job server(s) went away. Reconnecting.") time.sleep(reconnect_sleep) retry = True except Exception as e: - logger.critical("Exception: %s, %s" % (e.__class__, e)) + logger.critical("[worker] Exception: %s, %s" % (e.__class__, e)) retry = False + + logger.debug("[worker] Worker process terminated.")