Simplify logging

SeldonIO · Dec 11, 2018 · 40dcfcd · 40dcfcd
1 parent 5e75fe2
commit 40dcfcd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/python/seldon_core/microservice.py b/python/seldon_core/microservice.py
@@ -236,7 +236,6 @@ def parse_parameters(parameters):
 
 
 def load_annotations():
-    logger = logging.getLogger(__name__ + '.load_annotations')
     annotations = {}
     try:
         if os.path.isfile(ANNOTATIONS_FILE):
@@ -257,10 +256,8 @@ def load_annotations():
 
 
 def main():
-    LOG_FORMAT = '%(asctime)s - %(name)s:%(lineno)s - %(levelname)s:  %(message)s'
+    LOG_FORMAT = '%(asctime)s - %(name)s:%(funcName)s:%(lineno)s - %(levelname)s:  %(message)s'
     logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
-
-    logger = logging.getLogger(__name__ + '.main')
     logger.info('Starting microservice.py:main')
 
     sys.path.append(os.getcwd())

diff --git a/python/seldon_core/model_microservice.py b/python/seldon_core/model_microservice.py
@@ -52,7 +52,6 @@ def get_class_names(user_model, n_targets):
 # ----------------------------
 
 def get_rest_microservice(user_model, debug=False):
-    logger = logging.getLogger(__name__ + '.get_rest_microservice')
 
     app = Flask(__name__, static_url_path='')
     CORS(app)
@@ -227,22 +226,24 @@ def handle_stream(self, stream, address):
                     outData = NumpyArrayToSeldonRPC(predictions, class_names)
                     yield stream.write(outData)
                 except StreamClosedError:
-                    logger.exception("Stream closed during processing:", address)
+                    logger.exception(
+                        "Stream closed during processing:", address)
                     break
                 except Exception:
                     tb = traceback.format_exc()
-                    logger.exception("Caught exception during processing:", address, tb)
+                    logger.exception(
+                        "Caught exception during processing:", address, tb)
                     outData = CreateErrorMsg(tb)
                     yield stream.write(outData)
                     stream.close()
                     break
             except StreamClosedError:
-                logger.exception("Stream closed during data inputstream read:", address)
+                logger.exception(
+                    "Stream closed during data inputstream read:", address)
                 break
 
 
 def run_flatbuffers_server(user_model, port, debug=False):
-    logger = logging.getLogger(__name__ + '.run_flatbuffers_server')
     server = SeldonFlatbuffersServer(user_model)
     server.listen(port)
     logger.info("Tornado Server listening on port %s", port)

diff --git a/python/seldon_core/persistence.py b/python/seldon_core/persistence.py
@@ -24,7 +24,6 @@
 
 
 def restore(user_class, parameters, debug=False):
-    logger = logging.getLogger(__name__ + '.restore')
     logger.info("Restoring saved model from redis")
 
     redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT)
@@ -37,7 +36,6 @@ def restore(user_class, parameters, debug=False):
 
 
 def persist(user_object, push_frequency=None, debug=False):
-    logger = logging.getLogger(__name__ + '.persist')
 
     if push_frequency is None:
         push_frequency = DEFAULT_PUSH_FREQUENCY
@@ -47,7 +45,6 @@ def persist(user_object, push_frequency=None, debug=False):
 
 
 class PersistenceThread(threading.Thread):
-    logger = logging.getLogger(__name__ + '.PersistenceThread')
 
     def __init__(self, user_object, push_frequency):
         self.user_object = user_object

diff --git a/python/seldon_core/router_microservice.py b/python/seldon_core/router_microservice.py
@@ -35,7 +35,6 @@ def send_feedback(user_router, features, feature_names, routing, reward, truth):
 
 
 def get_rest_microservice(user_router, debug=False):
-    logger = logging.getLogger(__name__ + '.get_rest_microservice')
 
     app = Flask(__name__, static_url_path='')
     CORS(app)

diff --git a/python/seldon_core/transformer_microservice.py b/python/seldon_core/transformer_microservice.py
@@ -53,7 +53,6 @@ def get_class_names(user_model, original):
 # ----------------------------
 
 def get_rest_microservice(user_model, debug=False):
-    logger = logging.getLogger(__name__ + '.get_rest_microservice')
 
     app = Flask(__name__, static_url_path='')
     CORS(app)