commit 4c0fec81335d53547f9a0b1e20322041a5f5fd36 Author: Ondrej Lichtner olichtne@redhat.com Date: Tue Oct 2 13:42:12 2012 +0200
Logs: slaves use Server handler instead of SocketHandler
This commit makes slaves use the newly implemented ServerHandler instead of a combination of a MemoryHandler and a SocketHandler. This is another one of the changes required for the reversal of the communication between controller and slave logging.
I also removed the function append_network_hadler since it won't be used from now
Signed-off-by: Ondrej Lichtner olichtne@redhat.com
Common/Logs.py | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) --- diff --git a/Common/Logs.py b/Common/Logs.py index bf20e80..85099d4 100644 --- a/Common/Logs.py +++ b/Common/Logs.py @@ -13,6 +13,7 @@ import os, sys, shutil, datetime from logging import Formatter import logging.handlers import traceback +from Common.LoggingHandler import ServerHandler
LOCAL_IP = "(127.0.0.1)"
@@ -214,14 +215,6 @@ class Logs: cls.root_path = cls.prepare_logging(debug, waitForNet, recipe_path, to_display)
- - @staticmethod - def append_network_hadler(address, port): - """ - Append to log network handler. - """ - logging.net_handler.setTarget(logging.handlers.SocketHandler(address, port)) - @classmethod def clean_root_log_folder(cls, logRootPath): try: @@ -297,9 +290,8 @@ class Logs: root_logger.addHandler(display)
if waitForNet: - memory_handler = logging.handlers.MemoryHandler(1) - root_logger.addHandler(memory_handler) - logging.net_handler = memory_handler + server_handler = ServerHandler() + root_logger.addHandler(server_handler)
log_root_folder = cls.set_logging_root_path(recipe_path)
lnst-developers@lists.fedorahosted.org