github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 06:00:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix get_logs API command encoding error

Browse source 
* Fixes Tautulli/Tautulli-Issues#269
This commit is contained in:
JonnyWong16 2020-08-08 21:37:09 -07:00
parent 9bcd18f1b6
commit 1e1a8ddfb0
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/api2.py
View file

@ -21,6 +21,7 @@ from future.builtins import str
from future.builtins import object from future.builtins import object
from hashing_passwords import check_hash from hashing_passwords import check_hash
from io import open
import hashlib import hashlib
import inspect import inspect
@ -207,7 +208,7 @@ class API2(object):
logger.api_debug("Tautulli APIv2 :: Filtering log using regex '%s'" % regex) logger.api_debug("Tautulli APIv2 :: Filtering log using regex '%s'" % regex)
reg = re.compile(regex, flags=re.I) reg = re.compile(regex, flags=re.I)
with open(logfile, 'r') as f: with open(logfile, 'r', encoding='utf-8') as f:
for line in f.readlines(): for line in f.readlines():
temp_loglevel_and_time = None temp_loglevel_and_time = None
@ -223,7 +224,7 @@ class API2(object):
except IndexError: except IndexError:
# We assume this is a traceback # We assume this is a traceback
tl = (len(templog) - 1) tl = (len(templog) - 1)
templog[tl]['msg'] += helpers.sanitize(str(line.replace('\n', ''), 'utf-8')) templog[tl]['msg'] += helpers.sanitize(line.replace('\n', ''))
continue continue
if len(line) > 1 and temp_loglevel_and_time is not None and loglvl in line: if len(line) > 1 and temp_loglevel_and_time is not None and loglvl in line:
@ -231,7 +232,7 @@ class API2(object):
d = { d = {
'time': temp_loglevel_and_time[0], 'time': temp_loglevel_and_time[0],
'loglevel': loglvl, 'loglevel': loglvl,
'msg': helpers.sanitize(str(msg.replace('\n', ''), 'utf-8')), 'msg': helpers.sanitize(msg.replace('\n', '')),
'thread': thread 'thread': thread
} }
templog.append(d) templog.append(d)