From e42772be6f262ff49ef56f706e95545ea3fad7dd Mon Sep 17 00:00:00 2001 From: David Lehman Date: Fri, 6 Mar 2015 12:16:47 -0600 Subject: [PATCH 05/19] Include the current thread's name in log messages. --- blivet/event.py | 5 ++++- blivet/handler.py | 2 ++ blivet/util.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/blivet/event.py b/blivet/event.py index ebcd24c..50595a2 100644 --- a/blivet/event.py +++ b/blivet/event.py @@ -23,7 +23,7 @@ import abc import copy from collections import deque -from threading import RLock, Timer +from threading import RLock, Timer, currentThread import pyudev from six import add_metaclass @@ -285,4 +285,7 @@ class UdevEventManager(EventManager): def handle_event(self, *args, **kwargs): """ Enqueue a uevent and call the configured handler. """ + current_thread = currentThread() + current_thread.name = current_thread.name.replace("Thread-", + "EventManager") super(UdevEventManager, self).handle_event(args[0], args[1]) diff --git a/blivet/handler.py b/blivet/handler.py index 3a25a82..ec76ee7 100644 --- a/blivet/handler.py +++ b/blivet/handler.py @@ -23,6 +23,7 @@ import os import re import pprint +from threading import currentThread from six import add_metaclass from . import udev @@ -50,6 +51,7 @@ class EventHandler(object): log.debug("uevent queue is empty") return + currentThread().name = "Event%d" % event.id log.debug("event: %s", event) if event.action == "add": self.deviceAddedCB(event.info) diff --git a/blivet/util.py b/blivet/util.py index 77fe773..d76416a 100644 --- a/blivet/util.py +++ b/blivet/util.py @@ -450,7 +450,7 @@ def set_up_logging(log_file='/tmp/blivet.log'): program_log.setLevel(logging.DEBUG) handler = logging.FileHandler(log_file) handler.setLevel(logging.DEBUG) - formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s: %(message)s") + formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s/%(threadName)s: %(message)s") handler.setFormatter(formatter) log.addHandler(handler) program_log.addHandler(handler) -- 1.9.3