[spp] [PATCH 03/13] controller: aggregate logger to spp_common.py

[ogawa.yasufumi at lab.ntt.co.jp]

From: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>
---
 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