From ce51aeb3638660236ad1a304aa1a1f2be3bce3df Mon Sep 17 00:00:00 2001 From: vishal Date: Thu, 29 Aug 2019 19:15:00 +0000 Subject: [PATCH 1/2] Add timestamps to logs --- pkg/workloads/cortex/lib/log.py | 4 +++- pkg/workloads/cortex/onnx_serve/api.py | 2 +- pkg/workloads/cortex/tf_api/api.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/workloads/cortex/lib/log.py b/pkg/workloads/cortex/lib/log.py index ce8daa2322..b7dfc4c139 100644 --- a/pkg/workloads/cortex/lib/log.py +++ b/pkg/workloads/cortex/lib/log.py @@ -17,7 +17,9 @@ logger = logging.getLogger("cortex") handler = logging.StreamHandler() -handler.setFormatter(logging.Formatter(logging.BASIC_FORMAT, None)) +handler.setFormatter( + logging.Formatter("%(asctime)s:%(name)s:%(levelname)s:%(message)s", "'%Y-%m-%d %H:%M:%S.%f'") +) logger.addHandler(handler) logger.setLevel(logging.DEBUG) diff --git a/pkg/workloads/cortex/onnx_serve/api.py b/pkg/workloads/cortex/onnx_serve/api.py index ca0e67dfd3..6c565b714a 100644 --- a/pkg/workloads/cortex/onnx_serve/api.py +++ b/pkg/workloads/cortex/onnx_serve/api.py @@ -79,7 +79,7 @@ def after_request(response): if request.path != "/{}/{}".format(ctx.app["name"], api["name"]): return response - logger.info("[%s] %s", util.now_timestamp_rfc_3339(), response.status) + logger.info(response.status) predictions = None if "predictions" in g: diff --git a/pkg/workloads/cortex/tf_api/api.py b/pkg/workloads/cortex/tf_api/api.py index 1be937defd..5da60e0040 100644 --- a/pkg/workloads/cortex/tf_api/api.py +++ b/pkg/workloads/cortex/tf_api/api.py @@ -105,7 +105,7 @@ def after_request(response): if request.path != "/{}/{}".format(ctx.app["name"], api["name"]): return response - logger.info("[%s] %s", util.now_timestamp_rfc_3339(), response.status) + logger.info(response.status) predictions = None if "predictions" in g: From a00d29967eafae4042597e720cebfbb7f4728dec Mon Sep 17 00:00:00 2001 From: vishal Date: Thu, 29 Aug 2019 20:03:35 +0000 Subject: [PATCH 2/2] Add microseconds to the timestamp --- pkg/workloads/cortex/lib/log.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkg/workloads/cortex/lib/log.py b/pkg/workloads/cortex/lib/log.py index b7dfc4c139..e83e8feab0 100644 --- a/pkg/workloads/cortex/lib/log.py +++ b/pkg/workloads/cortex/lib/log.py @@ -14,12 +14,29 @@ import logging from cortex.lib import stringify +import datetime as dt + + +class MyFormatter(logging.Formatter): + converter = dt.datetime.fromtimestamp + + def formatTime(self, record, datefmt=None): + ct = self.converter(record.created) + if datefmt: + s = ct.strftime(datefmt) + else: + t = ct.strftime("%Y-%m-%d %H:%M:%S") + s = "%s,%03d" % (t, record.msecs) + return s + logger = logging.getLogger("cortex") handler = logging.StreamHandler() -handler.setFormatter( - logging.Formatter("%(asctime)s:%(name)s:%(levelname)s:%(message)s", "'%Y-%m-%d %H:%M:%S.%f'") +formatter = MyFormatter( + fmt="%(asctime)s:%(name)s:%(levelname)s:%(message)s", datefmt="%Y-%m-%d,%H:%M:%S.%f" ) +handler.setFormatter(formatter) + logger.addHandler(handler) logger.setLevel(logging.DEBUG)