commit 7fbb1756c0cb2df8aceddd8c5dca879393321bb1
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Thu Oct 18 16:16:22 2012 +0200
Remove LoggingServer.py
The LoggingServer is no longer needed therefore this patch removes it.
The patch also removes code related to the logging server. Other than
imports this includes the DEFAULT_LOG_PORT constant, and the
configuration option of logging port.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Common/Config.py | 5 +-
Common/LoggingHandler.py | 2 -
Common/LoggingServer.py | 158 ------------------------------------------
NetTest/NetTestController.py | 1 -
lnst.conf.example | 1 -
nettestctl.py | 1 -
6 files changed, 1 insertions(+), 167 deletions(-)
---
diff --git a/Common/Config.py b/Common/Config.py
index cf79c6c..e76fbef 100644
--- a/Common/Config.py
+++ b/Common/Config.py
@@ -28,7 +28,6 @@ class Config():
self.options = dict()
self.options['log'] = dict()
- self.options['log']['port'] = 9998
self.options['log']['path'] = os.path.join(
os.path.dirname(sys.argv[0]), './')
@@ -76,9 +75,7 @@ class Config():
config.pop('__name__', None)
for option in config:
- if option == 'port':
- section['port'] = self.optionPort(config[option])
- elif option == 'path':
+ if option == 'path':
section['path'] = self.optionLogPath(config[option], cfg_path)
else:
msg = "Unknown option: %s in section log" % option
diff --git a/Common/LoggingHandler.py b/Common/LoggingHandler.py
index cfcacb3..dae27bf 100644
--- a/Common/LoggingHandler.py
+++ b/Common/LoggingHandler.py
@@ -24,8 +24,6 @@ import socket, struct, pickle
import logging
import xmlrpclib
-DEFAULT_LOG_PORT = 9998
-
class LogBuffer(logging.Handler):
"""
Handler used for buffering log messages. Compared to the BufferingHandler
diff --git a/NetTest/NetTestController.py b/NetTest/NetTestController.py
index 888a5ba..5e5a134 100644
--- a/NetTest/NetTestController.py
+++ b/NetTest/NetTestController.py
@@ -23,7 +23,6 @@ from NetTest.NetTestParse import NetTestParse
from Common.SlaveUtils import prepare_client_session
from Common.NetUtils import MacPool
from NetTest.NetTestCommand import NetTestCommandContext, NetTestCommand, str_command
-from Common.LoggingServer import LoggingServer
from Common.VirtUtils import VirtNetCtl, VirtDomainCtl, BridgeCtl
from Common.Utils import wait_for
from NetTest.MachinePool import MachinePool
diff --git a/lnst.conf.example b/lnst.conf.example
index af64aa8..422804c 100644
--- a/lnst.conf.example
+++ b/lnst.conf.example
@@ -4,4 +4,3 @@ rpcport = 9999
machine_pool_dirs =
[log]
path = ./
-port = 9998
diff --git a/nettestctl.py b/nettestctl.py
index 4a32d99..d4178f4 100755
--- a/nettestctl.py
+++ b/nettestctl.py
@@ -19,7 +19,6 @@ import re
from NetTest.NetTestController import NetTestController, NetTestError
from NetTest.NetTestResultSerializer import NetTestResultSerializer
from Common.Logs import Logs
-from Common.LoggingServer import LoggingServer
import Common.ProcessManager
from Common.Config import Config
Show replies by date