Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-25 10:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Overwriting logging.Formatter._fmt seems to

Browse source 
no longer work in Python 3
This commit is contained in:
Odd Stråbø 2020-04-19 04:37:58 +02:00
parent 795dfd38df
commit 6c5ac6292d
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
jellyfin_kodi/helper/loghandler.py
View file

@ -61,10 +61,7 @@ class LogHandler(logging.StreamHandler):
for token in self.sensitive['Token']: for token in self.sensitive['Token']:
string = string.replace(token or "{token}", "{jellyfin-token}") string = string.replace(token or "{token}", "{jellyfin-token}")
try: xbmc.log(string, level=xbmc.LOGNOTICE)
xbmc.log(string, level=xbmc.LOGNOTICE)
except UnicodeEncodeError:
xbmc.log(string, level=xbmc.LOGNOTICE)
@classmethod @classmethod
def _get_log_level(cls, level): def _get_log_level(cls, level):
@ -85,27 +82,15 @@ class LogHandler(logging.StreamHandler):
class MyFormatter(logging.Formatter): class MyFormatter(logging.Formatter):
def __init__(self, fmt="%(name)s -> %(message)s"): def __init__(self, fmt='%(name)s -> %(levelname)s::%(relpath)s:%(lineno)s %(message)s'):
logging.Formatter.__init__(self, fmt) logging.Formatter.__init__(self, fmt)
def format(self, record): def format(self, record):
# Save the original format configured by the user
# when the logger formatter was instantiated
format_orig = self._fmt
self._gen_rel_path(record) self._gen_rel_path(record)
# Replace the original format with one customized by logging level
self._fmt = '%(name)s -> %(levelname)s::%(relpath)s:%(lineno)s %(message)s'
# Call the original formatter class to do the grunt work # Call the original formatter class to do the grunt work
result = logging.Formatter.format(self, record) result = logging.Formatter.format(self, record)
# Restore the original format configured by the user
self._fmt = format_orig
return result return result
def formatException(self, exc_info): def formatException(self, exc_info):