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

Mask emails and longer usernames first

Browse source
This commit is contained in:
JonnyWong16 2022-04-01 10:19:41 -07:00
parent 3cd98457c2
commit 5c06accca0
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/logger.py
View file

@ -126,7 +126,11 @@ class UsernameFilter(logging.Filter):
if not plexpy._INITIALIZED: if not plexpy._INITIALIZED:
return True return True
items = users.Users().get_users() or [] items = sorted(
users.Users().get_users(),
key=lambda x: len(x['username']),
reverse=True
)
for item in items: for item in items:
username = item['username'] username = item['username']
@ -339,11 +343,11 @@ def initLogger(console=False, log_dir=False, verbose=False):
logger_plex_websocket.handlers + \ logger_plex_websocket.handlers + \
cherrypy.log.error_log.handlers cherrypy.log.error_log.handlers
for handler in log_handlers: for handler in log_handlers:
handler.addFilter(UsernameFilter())
handler.addFilter(BlacklistFilter()) handler.addFilter(BlacklistFilter())
handler.addFilter(PublicIPFilter()) handler.addFilter(PublicIPFilter())
handler.addFilter(PlexDirectIPFilter()) handler.addFilter(PlexDirectIPFilter())
handler.addFilter(EmailFilter()) handler.addFilter(EmailFilter())
handler.addFilter(UsernameFilter())
handler.addFilter(PlexTokenFilter()) handler.addFilter(PlexTokenFilter())
# Install exception hooks # Install exception hooks

2
plexpy/users.py
View file

@ -668,7 +668,7 @@ class Users(object):
result = monitor_db.select(query=query) result = monitor_db.select(query=query)
except Exception as e: except Exception as e:
logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e) logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e)
return None return []
users = [] users = []
for item in result: for item in result: