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

Add module name to webauth and webstart log messages

Browse source
This commit is contained in:
JonnyWong16 2016-05-15 11:52:01 -07:00
parent cb8a5504f6
commit 885604ef06
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plexpy/webauth.py
View file

@ -66,7 +66,7 @@ def user_login(username=None, password=None):
# Register the new user / update the access tokens. # Register the new user / update the access tokens.
monitor_db = MonitorDatabase() monitor_db = MonitorDatabase()
try: try:
logger.debug(u"PlexPy Users :: Regestering tokens for user '%s' in the database." % username) logger.debug(u"PlexPy WebAuth :: Regestering tokens for user '%s' in the database." % username)
result = monitor_db.action('UPDATE users SET user_token = ?, server_token = ? WHERE user_id = ?', result = monitor_db.action('UPDATE users SET user_token = ?, server_token = ? WHERE user_id = ?',
[user_token, server_token, user_id]) [user_token, server_token, user_id])
@ -76,16 +76,16 @@ def user_login(username=None, password=None):
# Successful login # Successful login
return True return True
else: else:
logger.warn(u"PlexPy Users :: Unable to register user '%s' in database." % username) logger.warn(u"PlexPy WebAuth :: Unable to register user '%s' in database." % username)
return None return None
except Exception as e: except Exception as e:
logger.warn(u"PlexPy Users :: Unable to register user '%s' in database: %s." % (username, e)) logger.warn(u"PlexPy WebAuth :: Unable to register user '%s' in database: %s." % (username, e))
return None return None
else: else:
logger.warn(u"PlexPy Users :: Unable to retrieve Plex.tv server token for user '%s'." % username) logger.warn(u"PlexPy WebAuth :: Unable to retrieve Plex.tv server token for user '%s'." % username)
return None return None
else: else:
logger.warn(u"PlexPy Users :: Unable to retrieve Plex.tv user token for user '%s'." % username) logger.warn(u"PlexPy WebAuth :: Unable to retrieve Plex.tv user token for user '%s'." % username)
return None return None
return None return None
@ -192,11 +192,11 @@ class AuthController(object):
host=host, host=host,
user_agent=user_agent) user_agent=user_agent)
logger.debug(u"%s user '%s' logged into PlexPy." % (user_group.capitalize(), username)) logger.debug(u"PlexPy WebAuth :: %s user '%s' logged into PlexPy." % (user_group.capitalize(), username))
def on_logout(self, username, user_group): def on_logout(self, username, user_group):
"""Called on logout""" """Called on logout"""
logger.debug(u"%s User '%s' logged out of PlexPy." % (user_group.capitalize(), username)) logger.debug(u"PlexPy WebAuth :: %s User '%s' logged out of PlexPy." % (user_group.capitalize(), username))
def get_loginform(self, username="", msg=""): def get_loginform(self, username="", msg=""):
from plexpy.webserve import serve_template from plexpy.webserve import serve_template
@ -240,10 +240,10 @@ class AuthController(object):
raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT) raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
elif admin_login == '1': elif admin_login == '1':
logger.debug(u"Invalid admin login attempt from '%s'." % username) logger.debug(u"PlexPy WebAuth :: Invalid admin login attempt from '%s'." % username)
raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT) raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
else: else:
logger.debug(u"Invalid login attempt from '%s'." % username) logger.debug(u"PlexPy WebAuth :: Invalid login attempt from '%s'." % username)
return self.get_loginform(username, u"Incorrect username/email or password.") return self.get_loginform(username, u"Incorrect username/email or password.")
@cherrypy.expose @cherrypy.expose

8
plexpy/webstart.py
View file

@ -36,11 +36,11 @@ def initialize(options):
if plexpy.CONFIG.HTTPS_CREATE_CERT and \ if plexpy.CONFIG.HTTPS_CREATE_CERT and \
(not (https_cert and os.path.exists(https_cert)) or not (https_key and os.path.exists(https_key))): (not (https_cert and os.path.exists(https_cert)) or not (https_key and os.path.exists(https_key))):
if not create_https_certificates(https_cert, https_key): if not create_https_certificates(https_cert, https_key):
logger.warn("Unable to create certificate and key. Disabling HTTPS") logger.warn(u"PlexPy WebStart :: Unable to create certificate and key. Disabling HTTPS")
enable_https = False enable_https = False
if not (os.path.exists(https_cert) and os.path.exists(https_key)): if not (os.path.exists(https_cert) and os.path.exists(https_key)):
logger.warn("Disabled HTTPS because of missing certificate and key.") logger.warn(u"PlexPy WebStart :: Disabled HTTPS because of missing certificate and key.")
enable_https = False enable_https = False
options_dict = { options_dict = {
@ -65,7 +65,7 @@ def initialize(options):
protocol = "http" protocol = "http"
if options['http_password']: if options['http_password']:
logger.info("Web server authentication is enabled, username is '%s'", options['http_username']) logger.info(u"PlexPy WebStart :: Web server authentication is enabled, username is '%s'", options['http_username'])
options_dict['tools.sessions.on'] = auth_enabled = session_enabled = True options_dict['tools.sessions.on'] = auth_enabled = session_enabled = True
cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth) cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth)
else: else:
@ -207,7 +207,7 @@ def initialize(options):
cherrypy.tree.mount(WebInterface(), options['http_root'], config=conf) cherrypy.tree.mount(WebInterface(), options['http_root'], config=conf)
try: try:
logger.info("Starting PlexPy web server on %s://%s:%d%s", protocol, logger.info(u"PlexPy WebStart :: Starting PlexPy web server on %s://%s:%d%s", protocol,
options['http_host'], options['http_port'], options['http_root']) options['http_host'], options['http_port'], options['http_root'])
cherrypy.process.servers.check_port(str(options['http_host']), options['http_port']) cherrypy.process.servers.check_port(str(options['http_host']), options['http_port'])
if not plexpy.DEV: if not plexpy.DEV: