From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw0836.ocn.ad.jp (mogw0836.ocn.ad.jp [153.149.234.37]) by dpdk.org (Postfix) with ESMTP id 64B2D2BF1 for ; Tue, 6 Mar 2018 11:51:12 +0100 (CET) Received: from mf-smf-ucb025c2 (mf-smf-ucb025c2.ocn.ad.jp [153.153.66.164]) by mogw0836.ocn.ad.jp (Postfix) with ESMTP id C6D62600470; Tue, 6 Mar 2018 19:51:10 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb022 ([153.149.142.85]) by mf-smf-ucb025c2 with ESMTP id tABae2eo1yvP3tABaeT6C4; Tue, 06 Mar 2018 19:51:10 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.165]) by ntt.pod01.mv-mta-ucb022 with id JarA1x0093akymp01arAWg; Tue, 06 Mar 2018 10:51:10 +0000 Received: from localhost.localdomain (sp1-66-103-93.msc.spmode.ne.jp [1.66.103.93]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Tue, 6 Mar 2018 19:51:10 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: ferruh.yigit@intel.com, spp@dpdk.org Cc: Yasufumi Ogawa Date: Tue, 6 Mar 2018 19:50:45 +0900 Message-Id: <20180306105055.65210-4-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180306105055.65210-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180306105055.65210-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH 03/13] controller: aggregate logger to spp_common.py X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2018 10:51:13 -0000 From: Yasufumi Ogawa Signed-off-by: Yasufumi Ogawa --- src/controller/conn_thread.py | 15 +-------------- src/controller/shell.py | 15 +-------------- src/controller/spp.py | 15 +-------------- src/controller/spp_common.py | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 42 deletions(-) diff --git a/src/controller/conn_thread.py b/src/controller/conn_thread.py index 7ba3b00..1620046 100644 --- a/src/controller/conn_thread.py +++ b/src/controller/conn_thread.py @@ -2,23 +2,10 @@ from Queue import Queue import select import socket import spp_common +from spp_common import logger import threading import traceback -# Turn true if activate logger to debug remote command. -logger = None - -if logger is True: - import logging - logger = logging.getLogger(__name__) - handler = logging.StreamHandler() - handler.setLevel(logging.DEBUG) - formatter = logging.Formatter( - '%(asctime)s,[%(filename)s][%(name)s][%(levelname)s]%(message)s') - handler.setFormatter(formatter) - logger.setLevel(logging.DEBUG) - logger.addHandler(handler) - class ConnectionThread(threading.Thread): """Manage connection between controller and secondary""" diff --git a/src/controller/shell.py b/src/controller/shell.py index 145cbc3..06b0012 100644 --- a/src/controller/shell.py +++ b/src/controller/shell.py @@ -4,22 +4,9 @@ import os from Queue import Empty import re import spp_common +from spp_common import logger import subprocess -# Turn true if activate logger to debug remote command. -logger = None - -if logger is True: - import logging - logger = logging.getLogger(__name__) - handler = logging.StreamHandler() - handler.setLevel(logging.DEBUG) - formatter = logging.Formatter( - '%(asctime)s,[%(filename)s][%(name)s][%(levelname)s]%(message)s') - handler.setFormatter(formatter) - logger.setLevel(logging.DEBUG) - logger.addHandler(handler) - class Shell(cmd.Cmd, object): """SPP command prompt""" diff --git a/src/controller/spp.py b/src/controller/spp.py index d0d7bc9..7672cc9 100644 --- a/src/controller/spp.py +++ b/src/controller/spp.py @@ -10,24 +10,11 @@ from shell import Shell import socket import SocketServer import spp_common +from spp_common import logger import sys import threading import traceback -# Turn true if activate logger to debug remote command. -logger = None - -if logger is True: - import logging - logger = logging.getLogger(__name__) - handler = logging.StreamHandler() - handler.setLevel(logging.DEBUG) - formatter = logging.Formatter( - '%(asctime)s,[%(filename)s][%(name)s][%(levelname)s]%(message)s') - handler.setFormatter(formatter) - logger.setLevel(logging.DEBUG) - logger.addHandler(handler) - class CmdRequestHandler(SocketServer.BaseRequestHandler): """Request handler for getting message from remote entities""" diff --git a/src/controller/spp_common.py b/src/controller/spp_common.py index 8c5af07..4cbfffd 100644 --- a/src/controller/spp_common.py +++ b/src/controller/spp_common.py @@ -1,5 +1,19 @@ from Queue import Queue +# Turn true if activate logger to debug remote command. +logger = None + +if logger is True: + import logging + logger = logging.getLogger(__name__) + handler = logging.StreamHandler() + handler.setLevel(logging.DEBUG) + formatter = logging.Formatter( + '%(asctime)s,[%(filename)s][%(name)s][%(levelname)s]%(message)s') + handler.setFormatter(formatter) + logger.setLevel(logging.DEBUG) + logger.addHandler(handler) + PRIMARY = '' SECONDARY_LIST = [] -- 2.13.1