summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliangke <lokyse@163.com>2018-09-04 16:43:56 +0800
committerliangke <lokyse@163.com>2018-09-05 09:32:19 +0800
commit0303dc6e5210eee33de05a087a8ea40e80d43fb9 (patch)
tree87d4c094c16f592ab5f79eaaa5134f2059adecd1
parent7e1d40b6f91c4da5b52ef98a27f938ccc6229baf (diff)
Python3 compatible
Upgrade code compatibly with python-3.x Change-Id: I04f2e7a92d21f161a2e4cc904743043394616145 Issue-ID: MULTICLOUD-327 Signed-off-by: liangke <lokyse@163.com>
-rw-r--r--pylog/onaplogging/mdcContext.py34
-rw-r--r--pylog/onaplogging/mdcformatter.py59
-rw-r--r--pylog/requirements.txt4
3 files changed, 80 insertions, 17 deletions
diff --git a/pylog/onaplogging/mdcContext.py b/pylog/onaplogging/mdcContext.py
index 8162b50..60075b4 100644
--- a/pylog/onaplogging/mdcContext.py
+++ b/pylog/onaplogging/mdcContext.py
@@ -13,7 +13,9 @@
import logging
import threading
+import io
import os
+import traceback
import sys
import functools
@@ -21,7 +23,7 @@ import functools
__all__ = ['patch_loggingMDC', 'MDC']
_replace_func_name = ['info', 'critical', 'fatal', 'debug',
- 'error', 'warn', 'warning', 'findCaller']
+ 'error', 'warn', 'warning', 'log', 'findCaller']
class MDCContext(threading.local):
@@ -135,7 +137,20 @@ def error(self, msg, *args, **kwargs):
self._log(logging.ERROR, msg, args, **kwargs)
-def findCaller(self):
+@fetchkeys
+def log(self, level, msg, *args, **kwargs):
+
+ if not isinstance(level, int):
+ if logging.raiseExceptions:
+ raise TypeError("level must be an integer")
+ else:
+ return
+
+ if self.isEnabledFor(level):
+ self._log(level, msg, args, **kwargs)
+
+
+def findCaller(self, stack_info=False):
f = logging.currentframe()
if f is not None:
@@ -148,7 +163,20 @@ def findCaller(self):
if filename == logging._srcfile or co.co_name == "replace":
f = f.f_back
continue
- rv = (co.co_filename, f.f_lineno, co.co_name)
+ if sys.version_info > (3, 2):
+ sinfo = None
+ if stack_info:
+ sio = io.StringIO()
+ sio.write("Stack (most recent call last):\n")
+ traceback.print_stack(f, file=sio)
+ sinfo = sio.getvalue()
+ if sinfo[-1] == '\n':
+ sinfo = sinfo[:-1]
+ sio.close()
+ rv = (co.co_filename, f.f_lineno, co.co_name, sinfo)
+ else:
+ rv = (co.co_filename, f.f_lineno, co.co_name)
+
break
return rv
diff --git a/pylog/onaplogging/mdcformatter.py b/pylog/onaplogging/mdcformatter.py
index 253420d..01056a4 100644
--- a/pylog/onaplogging/mdcformatter.py
+++ b/pylog/onaplogging/mdcformatter.py
@@ -9,7 +9,7 @@
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
+import sys
import logging
@@ -19,15 +19,33 @@ class MDCFormatter(logging.Formatter):
to enrich log message.
"""
- def __init__(self, fmt=None, mdcfmt=None, datefmt=None):
+ def __init__(self, fmt=None, mdcfmt=None, datefmt=None, style="%"):
"""
:param fmt: build-in format string contains standard
Python %-style mapping keys
:param mdcFmt: mdc format with '{}'-style mapping keys
:param datefmt: Date format to use
+ :param style: style mapping keys in python3
"""
+ if sys.version_info > (3, 2):
+ super(MDCFormatter, self).__init__(fmt=fmt, datefmt=datefmt,
+ style=style)
+ elif sys.version_info > (2, 7):
+ super(MDCFormatter, self).__init__(fmt=fmt, datefmt=datefmt)
+ else:
+ logging.Formatter.__init__(self, fmt, datefmt)
+
+ self.style = style
+ self._mdc_tag = "%(mdc)s"
+ if sys.version_info > (3, 2):
+ if self.style not in logging._STYLES:
+ raise ValueError('Style must be one of: %s' % ','.join(
+ logging._STYLES.keys()))
+ if self.style == "{":
+ self._mdc_tag = "{mdc}"
+ elif self.style == "$":
+ self._mdc_tag = "${mdc}"
- super(MDCFormatter, self).__init__(fmt=fmt, datefmt=datefmt)
self._tmpfmt = self._fmt
if mdcfmt:
self._mdcFmt = mdcfmt
@@ -60,7 +78,7 @@ class MDCFormatter(logging.Formatter):
elif len(st) > 0:
st.pop()
- keys = filter(lambda x: x[1:-1].strip('\n \t ') != "", keys)
+ keys = list(filter(lambda x: x[1:-1].strip('\n \t ') != "", keys))
words = None
if keys:
words = map(lambda x: x[1:-1], keys)
@@ -88,15 +106,25 @@ class MDCFormatter(logging.Formatter):
the output of mdc message: 'key1=value1 key3='
"""
- mdcIndex = self._fmt.find('%(mdc)s')
+ mdcIndex = self._fmt.find(self._mdc_tag)
if mdcIndex == -1:
- return super(MDCFormatter, self).format(record)
+ if sys.version_info > (2, 7):
+ return super(MDCFormatter, self).format(record)
+ else:
+ return logging.Formatter.format(self, record)
mdcFmtkeys, mdcFmtWords = self._mdcfmtKey()
- if mdcFmtWords is None:
- self._fmt = self._fmt.replace("%(mdc)s", "")
- return super(MDCFormatter, self).format(record)
+ if mdcFmtWords is None:
+ if sys.version_info > (3, 2):
+ self._style = logging._STYLES[self.style][0](
+ self._fmt.replace(self._mdc_tag, ""))
+ else:
+ self._fmt = self._fmt.replace(self._mdc_tag, "")
+ if sys.version_info > (2, 7):
+ return super(MDCFormatter, self).format(record)
+ else:
+ return logging.Formatter.format(self, record)
mdc = record.__dict__.get('mdc', None)
res = {}
@@ -109,12 +137,19 @@ class MDCFormatter(logging.Formatter):
del mdc
try:
mdcstr = self._replaceStr(keys=mdcFmtkeys).format(**res)
- self._fmt = self._fmt.replace("%(mdc)s", mdcstr)
- s = super(MDCFormatter, self).format(record)
+ if sys.version_info > (3, 2):
+ self._style = logging._STYLES[self.style][0](
+ self._fmt.replace(self._mdc_tag, mdcstr))
+ else:
+ self._fmt = self._fmt.replace(self._mdc_tag, mdcstr)
+ if sys.version_info > (2, 7):
+ s = super(MDCFormatter, self).format(record)
+ else:
+ s = logging.Formatter.format(self, record)
return s
except KeyError as e:
- print("The mdc key %s format is wrong" % e.message)
+ print("The mdc key %s format is wrong" % str(e))
except Exception:
raise
diff --git a/pylog/requirements.txt b/pylog/requirements.txt
index 3fb9241..16afb32 100644
--- a/pylog/requirements.txt
+++ b/pylog/requirements.txt
@@ -1,2 +1,2 @@
-PyYAML>=3.10
-watchdog>=0.8.3
+PyYAML
+watchdog