coop-cloud-chaos-patchs/calibre-web
0
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Revert logging functions

Browse Source 
Fix access logger for tornado
This commit is contained in:
Ozzieisaacs
2019-06-11 18:35:20 +02:00
parent 8e4539cf8e
commit 26949970d8
18 changed files with 180 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cps/gdriveutils.py
View File

@ -45,7 +45,7 @@ SETTINGS_YAML = os.path.join(_BASE_DIR, 'settings.yaml')
CREDENTIALS = os.path.join(_BASE_DIR, 'gdrive_credentials')
CLIENT_SECRETS = os.path.join(_BASE_DIR, 'client_secrets.json')
# log = logger.create()
log = logger.create()
class Singleton:
@ -169,9 +169,9 @@ def getDrive(drive=None, gauth=None):
try:
gauth.Refresh()
except RefreshError as e:
logger.error("Google Drive error: %s", e)
log.error("Google Drive error: %s", e)
except Exception as e:
logger.exception(e)
log.exception(e)
else:
# Initialize the saved creds
gauth.Authorize()
@ -181,7 +181,7 @@ def getDrive(drive=None, gauth=None):
try:
drive.auth.Refresh()
except RefreshError as e:
logger.error("Google Drive error: %s", e)
log.error("Google Drive error: %s", e)
return drive
def listRootFolders():
@ -218,7 +218,7 @@ def getEbooksFolderId(drive=None):
try:
gDriveId.gdrive_id = getEbooksFolder(drive)['id']
except Exception:
logger.error('Error gDrive, root ID not found')
log.error('Error gDrive, root ID not found')
gDriveId.path = '/'
session.merge(gDriveId)
session.commit()
@ -458,10 +458,10 @@ def getChangeById (drive, change_id):
change = drive.auth.service.changes().get(changeId=change_id).execute()
return change
except (errors.HttpError) as error:
logger.error(error)
log.error(error)
return None
except Exception as e:
logger.error(e)
log.error(e)
return None
@ -531,6 +531,6 @@ def do_gdrive_download(df, headers):
if resp.status == 206:
yield content
else:
logger.warning('An error occurred: %s', resp)
log.warning('An error occurred: %s', resp)
return
return Response(stream_with_context(stream()), headers=headers)