From: Ondrej Lichtner <olichtne(a)redhat.com>
This commit changes the format of log messages, instead of using
hostnames, which are usually IP addresses, we will use the host ids that
are specified in the supplied recipe.
This makes it more obvious what's happening on which machine. The
information about the used hosts is still available at the beginning of
recipe execution when the controller finds a suitable match.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Common/Logs.py | 19 +++++++++----------
lnst/Controller/NetTestController.py | 2 +-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/lnst/Common/Logs.py b/lnst/Common/Logs.py
index 33a43a7..b891439 100644
--- a/lnst/Common/Logs.py
+++ b/lnst/Common/Logs.py
@@ -44,7 +44,7 @@ class MultilineFormatter(Formatter): # addr:17 level:7
def _format_addr(self, record):
if not "address" in record.__dict__:
- addr = "(127.0.0.1)".rjust(17)
+ addr = "(localhost)".rjust(17)
else:
addr = record.address.rjust(17)
@@ -145,11 +145,11 @@ class LoggingCtl:
logger.removeHandler(self.recipe_handlers[1])
self.recipe_handlers = (None, None)
- def add_slave(self, slave_id, name):
- slave_log_path = os.path.join(self.recipe_log_path, name)
+ def add_slave(self, slave_id):
+ slave_log_path = os.path.join(self.recipe_log_path, slave_id)
self._clean_folder(slave_log_path)
- logger = logging.getLogger(name)
+ logger = logging.getLogger(slave_id)
logger.setLevel(logging.DEBUG)
logger.propagate = True
@@ -157,22 +157,21 @@ class LoggingCtl:
logger.addHandler(slave_info)
logger.addHandler(slave_debug)
- self.slaves[slave_id] = (name, slave_info, slave_debug)
+ self.slaves[slave_id] = (slave_info, slave_debug)
def remove_slave(self, slave_id):
- logger = logging.getLogger(self.slaves[slave_id][0])
+ logger = logging.getLogger(slave_id)
logger.propagate = False
+ logger.removeHandler(self.slaves[slave_id][0])
logger.removeHandler(self.slaves[slave_id][1])
- logger.removeHandler(self.slaves[slave_id][2])
del self.slaves[slave_id]
def add_client_log(self, slave_id, log_record):
- name = self.slaves[slave_id][0]
- logger = logging.getLogger(name)
+ logger = logging.getLogger(slave_id)
- log_record['address'] = '(' + name + ')'
+ log_record['address'] = '(' + slave_id + ')'
record = logging.makeLogRecord(log_record)
logger.handle(record)
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index 320182e..cce1678 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -198,7 +198,7 @@ class NetTestController:
machine = self._machines[m_id]
address = socket.gethostbyname(machine.get_hostname())
- self._log_ctl.add_slave(m_id, address)
+ self._log_ctl.add_slave(m_id)
machine.set_rpc(self._msg_dispatcher)
machine.set_mac_pool(self._mac_pool)
machine.set_network_bridges(self._network_bridges)
--
1.8.3.1
Show replies by date