mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-11-07 02:33:01 +00:00
Code Issues Releases Wiki Activity

Refactored exception logging

Browse Source
This commit is contained in:
Ozzieisaacs
2020-12-12 08:11:00 +01:00
parent 1ae778d81e
commit b637a63e71
10 changed files with 27 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cps/oauth_bb.py
View File

@@ -88,10 +88,7 @@ def register_user_with_oauth(user=None):
try:
ub.session.commit()
except Exception as e:
if config.config_log_level == logger.logging.DEBUG:
log.exception(e)
else:
log.error(e)
log.debug_or_exception(e)
ub.session.rollback()
@@ -210,10 +207,7 @@ if ub.oauth_support:
ub.session.add(oauth_entry)
ub.session.commit()
except Exception as e:
if config.config_log_level == logger.logging.DEBUG:
log.exception(e)
else:
log.error(e)
log.debug_or_exception(e)
ub.session.rollback()
# Disable Flask-Dance's default behavior for saving the OAuth token
@@ -245,10 +239,7 @@ if ub.oauth_support:
flash(_(u"Link to %(oauth)s Succeeded", oauth=provider_name), category="success")
return redirect(url_for('web.profile'))
except Exception as e:
if config.config_log_level == logger.logging.DEBUG:
log.exception(e)
else:
log.error(e)
log.debug_or_exception(e)
ub.session.rollback()
else:
flash(_(u"Login failed, No User Linked With OAuth Account"), category="error")
@@ -295,10 +286,7 @@ if ub.oauth_support:
logout_oauth_user()
flash(_(u"Unlink to %(oauth)s Succeeded", oauth=oauth_check[provider]), category="success")
except Exception as e:
if config.config_log_level == logger.logging.DEBUG:
log.exception(e)
else:
log.error(e)
log.debug_or_exception(e)
ub.session.rollback()
flash(_(u"Unlink to %(oauth)s Failed", oauth=oauth_check[provider]), category="error")
except NoResultFound: