user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates dependencies

Browse Source 
Update logger ->filename is logged instead of responsible logger
This commit is contained in:
Ozzie Isaacs
2025-03-23 15:12:06 +01:00
parent 6dd7a023f3
commit 646937272a
6 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/tasks/mail.py
+8 -8
View File
@@ -35,7 +35,7 @@ from cps.embed_helper import do_calibre_export
from cps import logger, config
from cps import gdriveutils
from cps.string_helper import strip_whitespaces
import uuid
log = logger.create()
@@ -56,7 +56,7 @@ class EmailBase:
def send(self, strg):
"""Send `strg' to the server."""
log.debug_no_auth('send: {}'.format(strg[:300]))
log.debug_no_auth('send: {}'.format(strg[:300]), stacklevel=2)
if hasattr(self, 'sock') and self.sock:
try:
if self.transferSize:
@@ -169,14 +169,14 @@ class TaskEmail(CalibreTask):
else:
self.send_gmail_email(msg)
except MemoryError as e:
log.error_or_exception(e, stacklevel=3)
log.error_or_exception(e, stacklevel=2)
self._handleError('MemoryError sending e-mail: {}'.format(str(e)))
except (smtplib.SMTPRecipientsRefused) as e:
log.error_or_exception(e, stacklevel=3)
log.error_or_exception(e, stacklevel=2)
self._handleError('Smtplib Error sending e-mail: {}'.format(
(list(e.args[0].values())[0][1]).decode('utf-8)').replace("\n", '. ')))
except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
log.error_or_exception(e, stacklevel=3)
log.error_or_exception(e, stacklevel=2)
if hasattr(e, "smtp_error"):
text = e.smtp_error.decode('utf-8').replace("\n", '. ')
elif hasattr(e, "message"):
@@ -187,10 +187,10 @@ class TaskEmail(CalibreTask):
text = ''
self._handleError('Smtplib Error sending e-mail: {}'.format(text))
except (socket.error) as e:
log.error_or_exception(e, stacklevel=3)
log.error_or_exception(e, stacklevel=2)
self._handleError('Socket Error sending e-mail: {}'.format(e.strerror))
except Exception as ex:
log.error_or_exception(ex, stacklevel=3)
log.error_or_exception(ex, stacklevel=2)
self._handleError('Error sending e-mail: {}'.format(ex))
def send_standard_email(self, msg):
@@ -273,7 +273,7 @@ class TaskEmail(CalibreTask):
if config.config_binariesdir and config.config_embed_metadata:
os.remove(datafile)
except IOError as e:
log.error_or_exception(e, stacklevel=3)
log.error_or_exception(e, stacklevel=2)
log.error('The requested file could not be read. Maybe wrong permissions?')
return None
return data