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

Rename Plex websocket log

Browse source
This commit is contained in:
JonnyWong16 2017-12-02 12:28:38 -08:00
parent a6ee70b7ec
commit 1d9d16b69b
3 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/interfaces/default/logs.html
View file

@ -58,9 +58,9 @@
<ul id="log_tabs" class="nav nav-pills" role="tablist"> <ul id="log_tabs" class="nav nav-pills" role="tablist">
<li role="presentation" class="active"><a id="plexpy-logs-btn" href="#tabs-plexpy_log" aria-controls="tabs-plexpy_log" role="tab" data-toggle="tab">PlexPy Logs</a></li> <li role="presentation" class="active"><a id="plexpy-logs-btn" href="#tabs-plexpy_log" aria-controls="tabs-plexpy_log" role="tab" data-toggle="tab">PlexPy Logs</a></li>
<li role="presentation"><a id="plexpy-api-logs-btn" href="#tabs-plexpy_api_log" aria-controls="tabs-plexpy_api_log" role="tab" data-toggle="tab">PlexPy API Logs</a></li> <li role="presentation"><a id="plexpy-api-logs-btn" href="#tabs-plexpy_api_log" aria-controls="tabs-plexpy_api_log" role="tab" data-toggle="tab">PlexPy API Logs</a></li>
<li role="presentation"><a id="plexpy-websocket-logs-btn" href="#tabs-plexpy_websocket_log" aria-controls="tabs-plexpy_websocket_log" role="tab" data-toggle="tab">PlexPy Websocket Logs</a></li>
<li role="presentation"><a id="plex-logs-btn" href="#tabs-plex_log" aria-controls="tabs-plex_log" role="tab" data-toggle="tab">Plex Media Server Logs</a></li> <li role="presentation"><a id="plex-logs-btn" href="#tabs-plex_log" aria-controls="tabs-plex_log" role="tab" data-toggle="tab">Plex Media Server Logs</a></li>
<li role="presentation"><a id="plex-scanner-logs-btn" href="#tabs-plex_scanner_log" aria-controls="tabs-plex_scanner_log" role="tab" data-toggle="tab">Plex Media Scanner Logs</a></li> <li role="presentation"><a id="plex-scanner-logs-btn" href="#tabs-plex_scanner_log" aria-controls="tabs-plex_scanner_log" role="tab" data-toggle="tab">Plex Media Scanner Logs</a></li>
<li role="presentation"><a id="plexpy-websocket-logs-btn" href="#tabs-plex_websocket_log" aria-controls="tabs-plex_websocket_log" role="tab" data-toggle="tab">Plex Websocket Logs</a></li>
<li role="presentation"><a id="notification-logs-btn" href="#tabs-notification_log" aria-controls="tabs-notification_log" role="tab" data-toggle="tab">Notification Logs</a></li> <li role="presentation"><a id="notification-logs-btn" href="#tabs-notification_log" aria-controls="tabs-notification_log" role="tab" data-toggle="tab">Notification Logs</a></li>
<li role="presentation"><a id="login-logs-btn" href="#tabs-login_log" aria-controls="tabs-login_log" role="tab" data-toggle="tab">Login Logs</a></li> <li role="presentation"><a id="login-logs-btn" href="#tabs-login_log" aria-controls="tabs-login_log" role="tab" data-toggle="tab">Login Logs</a></li>
</ul> </ul>
@ -89,8 +89,8 @@
<tbody></tbody> <tbody></tbody>
</table> </table>
</div> </div>
<div role="tabpanel" class="tab-pane" id="tabs-plexpy_websocket_log" data-logfile="plexpy_websocket"> <div role="tabpanel" class="tab-pane" id="tabs-plex_websocket_log" data-logfile="plex_websocket">
<table class="display" id="plexpy_websocket_log_table" width="100%"> <table class="display" id="plex_websocket_log_table" width="100%">
<thead> <thead>
<tr> <tr>
<th class="min-tablet" align="left" id="timestamp">Timestamp</th> <th class="min-tablet" align="left" id="timestamp">Timestamp</th>
@ -323,8 +323,8 @@
$("#download-plexscannerlog").hide() $("#download-plexscannerlog").hide()
$("#clear-notify-logs").hide(); $("#clear-notify-logs").hide();
$("#clear-login-logs").hide(); $("#clear-login-logs").hide();
loadPlexPyLogs('plexpy_websocket', selected_log_level); loadPlexPyLogs('plex_websocket', selected_log_level);
clearSearchButton('plexpy_websocket_log_table', log_table); clearSearchButton('plex_websocket_log_table', log_table);
}); });
$("#plex-logs-btn").click(function () { $("#plex-logs-btn").click(function () {
@ -475,7 +475,7 @@
if(refreshrate.value != 0) if(refreshrate.value != 0)
{ {
timer = setInterval(function() { timer = setInterval(function() {
if ($("#tabs-plexpy_log").hasClass("active") || $("#tabs-plexpy_api_log").hasClass("active") || $("#tabs-plexpy_websocket_log").hasClass("active")) { if ($("#tabs-plexpy_log").hasClass("active") || $("#tabs-plexpy_api_log").hasClass("active") || $("#tabs-plex_websocket_log").hasClass("active")) {
log_table.ajax.reload(); log_table.ajax.reload();
} else if ($("#tabs-plex_log").hasClass("active")) { } else if ($("#tabs-plex_log").hasClass("active")) {
plex_log_table.ajax.reload(); plex_log_table.ajax.reload();

30
plexpy/logger.py
View file

@ -32,7 +32,7 @@ import helpers
# These settings are for file logging only # These settings are for file logging only
FILENAME = "plexpy.log" FILENAME = "plexpy.log"
FILENAME_API = "plexpy_api.log" FILENAME_API = "plexpy_api.log"
FILENAME_WEBSOCKET = "plexpy_websocket.log" FILENAME_PLEX_WEBSOCKET = "plex_websocket.log"
MAX_SIZE = 5000000 # 5 MB MAX_SIZE = 5000000 # 5 MB
MAX_FILES = 5 MAX_FILES = 5
@ -43,7 +43,7 @@ logger = logging.getLogger("plexpy")
# PlexPy API logger # PlexPy API logger
logger_api = logging.getLogger("plexpy_api") logger_api = logging.getLogger("plexpy_api")
# PlexPy websocket logger # PlexPy websocket logger
logger_websocket = logging.getLogger("plexpy_websocket") logger_plex_websocket = logging.getLogger("plex_websocket")
# Global queue for multiprocessing logging # Global queue for multiprocessing logging
queue = None queue = None
@ -190,7 +190,7 @@ def initLogger(console=False, log_dir=False, verbose=False):
# Close and remove old handlers. This is required to reinit the loggers # Close and remove old handlers. This is required to reinit the loggers
# at runtime # at runtime
for handler in logger.handlers[:] + logger_api.handlers[:] + logger_websocket.handlers[:]: for handler in logger.handlers[:] + logger_api.handlers[:] + logger_plex_websocket.handlers[:]:
# Just make sure it is cleaned up. # Just make sure it is cleaned up.
if isinstance(handler, handlers.RotatingFileHandler): if isinstance(handler, handlers.RotatingFileHandler):
handler.close() handler.close()
@ -199,15 +199,15 @@ def initLogger(console=False, log_dir=False, verbose=False):
logger.removeHandler(handler) logger.removeHandler(handler)
logger_api.removeHandler(handler) logger_api.removeHandler(handler)
logger_websocket.removeHandler(handler) logger_plex_websocket.removeHandler(handler)
# Configure the logger to accept all messages # Configure the logger to accept all messages
logger.propagate = False logger.propagate = False
logger.setLevel(logging.DEBUG if verbose else logging.INFO) logger.setLevel(logging.DEBUG if verbose else logging.INFO)
logger_api.propagate = False logger_api.propagate = False
logger_api.setLevel(logging.DEBUG if verbose else logging.INFO) logger_api.setLevel(logging.DEBUG if verbose else logging.INFO)
logger_websocket.propagate = False logger_plex_websocket.propagate = False
logger_websocket.setLevel(logging.DEBUG if verbose else logging.INFO) logger_plex_websocket.setLevel(logging.DEBUG if verbose else logging.INFO)
# Setup file logger # Setup file logger
if log_dir: if log_dir:
@ -230,12 +230,12 @@ def initLogger(console=False, log_dir=False, verbose=False):
logger_api.addHandler(file_handler) logger_api.addHandler(file_handler)
# PlexPy websocket logger # PlexPy websocket logger
filename = os.path.join(log_dir, FILENAME_WEBSOCKET) filename = os.path.join(log_dir, FILENAME_PLEX_WEBSOCKET)
file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES) file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES)
file_handler.setLevel(logging.DEBUG) file_handler.setLevel(logging.DEBUG)
file_handler.setFormatter(file_formatter) file_handler.setFormatter(file_formatter)
logger_websocket.addHandler(file_handler) logger_plex_websocket.addHandler(file_handler)
# Setup console logger # Setup console logger
if console: if console:
@ -250,7 +250,7 @@ def initLogger(console=False, log_dir=False, verbose=False):
# Only add filters after the config file has been initialized # Only add filters after the config file has been initialized
# Nothing prior to initialization should contain sensitive information # Nothing prior to initialization should contain sensitive information
if not plexpy.DEV and plexpy.CONFIG: if not plexpy.DEV and plexpy.CONFIG:
for handler in logger.handlers + logger_api.handlers + logger_websocket.handlers: for handler in logger.handlers + logger_api.handlers + logger_plex_websocket.handlers:
handler.addFilter(BlacklistFilter()) handler.addFilter(BlacklistFilter())
handler.addFilter(PublicIPFilter()) handler.addFilter(PublicIPFilter())
@ -324,9 +324,9 @@ api_warning = logger_api.warning
api_exception = logger_api.exception api_exception = logger_api.exception
# PlexPy websocket logger # PlexPy websocket logger
websocket_info = logger_websocket.info websocket_info = logger_plex_websocket.info
websocket_warn = logger_websocket.warn websocket_warn = logger_plex_websocket.warn
websocket_error = logger_websocket.error websocket_error = logger_plex_websocket.error
websocket_debug = logger_websocket.debug websocket_debug = logger_plex_websocket.debug
websocket_warning = logger_websocket.warning websocket_warning = logger_plex_websocket.warning
websocket_exception = logger_websocket.exception websocket_exception = logger_plex_websocket.exception

20
plexpy/webserve.py
View file

@ -2309,8 +2309,8 @@ class WebInterface(object):
if logfile == "plexpy_api": if logfile == "plexpy_api":
filename = logger.FILENAME_API filename = logger.FILENAME_API
elif logfile == "plexpy_websocket": elif logfile == "plex_websocket":
filename = logger.FILENAME_WEBSOCKET filename = logger.FILENAME_PLEX_WEBSOCKET
else: else:
filename = logger.FILENAME filename = logger.FILENAME
@ -2512,8 +2512,8 @@ class WebInterface(object):
def delete_logs(self, logfile='', **kwargs): def delete_logs(self, logfile='', **kwargs):
if logfile == "plexpy_api": if logfile == "plexpy_api":
filename = logger.FILENAME_API filename = logger.FILENAME_API
elif logfile == "plexpy_websocket": elif logfile == "plex_websocket":
filename = logger.FILENAME_WEBSOCKET filename = logger.FILENAME_PLEX_WEBSOCKET
else: else:
filename = logger.FILENAME filename = logger.FILENAME
@ -2554,8 +2554,8 @@ class WebInterface(object):
def logFile(self, logfile='', **kwargs): def logFile(self, logfile='', **kwargs):
if logfile == "plexpy_api": if logfile == "plexpy_api":
filename = logger.FILENAME_API filename = logger.FILENAME_API
elif logfile == "plexpy_websocket": elif logfile == "plex_websocket":
filename = logger.FILENAME_WEBSOCKET filename = logger.FILENAME_PLEX_WEBSOCKET
else: else:
filename = logger.FILENAME filename = logger.FILENAME
@ -3782,13 +3782,13 @@ class WebInterface(object):
""" Download the PlexPy log file. """ """ Download the PlexPy log file. """
if logfile == "plexpy_api": if logfile == "plexpy_api":
filename = logger.FILENAME_API filename = logger.FILENAME_API
log = logger.logger
elif logfile == "plexpy_websocket":
filename = logger.FILENAME_WEBSOCKET
log = logger.logger_api log = logger.logger_api
elif logfile == "plex_websocket":
filename = logger.FILENAME_PLEX_WEBSOCKET
log = logger.logger_plex_websocket
else: else:
filename = logger.FILENAME filename = logger.FILENAME
log = logger.logger_websocket log = logger.logger
try: try:
log.flush() log.flush()