diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html
index ecb1d17f..04a2938a 100644
--- a/data/interfaces/default/logs.html
+++ b/data/interfaces/default/logs.html
@@ -29,6 +29,7 @@ from plexpy import helpers
@@ -57,6 +58,19 @@ from plexpy import helpers
+
+
+
+
+ Timestamp |
+ Level |
+ Message |
+
+
+
+
+
+
@@ -98,11 +112,18 @@ from plexpy import helpers
function LoadPlexLogs() {
plex_log_table_options.ajax = {
- "url": "get_plex_log"
+ "url": "get_plex_log?log_type=server"
}
plex_log_table = $('#plex_log_table').DataTable(plex_log_table_options);
}
+ function LoadPlexScannerLogs() {
+ plex_log_table_options.ajax = {
+ "url": "get_plex_log?log_type=scanner"
+ }
+ plex_scanner_log_table = $('#plex_scanner_log_table').DataTable(plex_log_table_options);
+ }
+
$("#plexpy-logs-btn").click(function() {
$("#clear-logs").show();
LoadPlexPyLogs();
@@ -115,6 +136,12 @@ from plexpy import helpers
clearSearchButton('plex_log_table', plex_log_table);
});
+ $("#plex-scanner-logs-btn").click(function() {
+ $("#clear-logs").hide();
+ LoadPlexScannerLogs();
+ clearSearchButton('plex_scanner_log_table', plex_scanner_log_table);
+ });
+
$("#clear-logs").click(function() {
var r = confirm("Are you sure you want to clear the PlexPy log?");
if (r == true) {
diff --git a/plexpy/log_reader.py b/plexpy/log_reader.py
index b8b78329..c251e210 100644
--- a/plexpy/log_reader.py
+++ b/plexpy/log_reader.py
@@ -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 []
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 0349de6f..28759f10 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -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.")