anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Plex Media Scanner log files to Log viewer.

Browse Source
This commit is contained in:
Tim Van
2016-02-18 18:01:42 +02:00
parent 1c8428c3ea
commit 71d30af582
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plexpy/log_reader.py
View File

@@ -18,10 +18,14 @@ import re
import os
import plexpy
def get_log_tail(window=20, parsed=True):
def get_log_tail(window=20, parsed=True, log_type="server"):
if plexpy.CONFIG.PMS_LOGS_FOLDER:
log_file = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, 'Plex Media Server.log')
log_file = ""
if log_type == "server":
log_file = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, 'Plex Media Server.log')
elif log_type == "scanner":
log_file = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, 'Plex Media Scanner.log')
else:
return []

7
plexpy/webserve.py
View File

@@ -1072,8 +1072,13 @@ class WebInterface(object):
@addtoapi()
def get_plex_log(self, window=1000, **kwargs):
log_lines = []
log_type = ""
if 'log_type' in kwargs:
log_type = kwargs.get('log_type', "server")
try:
log_lines = {'data': log_reader.get_log_tail(window=window)}
log_lines = {'data': log_reader.get_log_tail(window=window, parsed=True, log_type=log_type)}
except:
logger.warn(u"Unable to retrieve Plex Logs.")