stackforge/libra
Code Issues Proposed changes

Tag worker log messages with prefix.

Browse Source 
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
This commit is contained in:
David Shrewsbury
2012-11-09 09:57:46 -05:00
parent 1c2c932f53
commit 6e491e5356
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libra/worker/worker.py
View File

@@ -38,7 +38,6 @@ def handler(worker, job):
logger = worker.logger logger = worker.logger
driver = worker.driver driver = worker.driver
logger.debug("Entered worker task")
logger.debug("Received JSON message: %s" % json.dumps(job.data, indent=4)) logger.debug("Received JSON message: %s" % json.dumps(job.data, indent=4))
controller = LBaaSController(logger, driver, job.data) controller = LBaaSController(logger, driver, job.data)
@@ -51,7 +50,7 @@ def handler(worker, job):
def config_manager(logger, driver, servers, reconnect_sleep): def config_manager(logger, driver, servers, reconnect_sleep):
my_ip = socket.gethostbyname(socket.gethostname()) my_ip = socket.gethostbyname(socket.gethostname())
task_name = "lbaas-%s" % my_ip 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 = CustomJSONGearmanWorker(servers)
worker.set_client_id(my_ip) worker.set_client_id(my_ip)
@@ -67,9 +66,11 @@ def config_manager(logger, driver, servers, reconnect_sleep):
except KeyboardInterrupt: except KeyboardInterrupt:
retry = False retry = False
except gearman.errors.ServerUnavailable: 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) time.sleep(reconnect_sleep)
retry = True retry = True
except Exception as e: except Exception as e:
logger.critical("Exception: %s, %s" % (e.__class__, e)) logger.critical("[worker] Exception: %s, %s" % (e.__class__, e))
retry = False retry = False
logger.debug("[worker] Worker process terminated.")