Commit a659f2e4 authored by Ozzieisaacs's avatar Ozzieisaacs

Improved logging for emails

Removed private data from debug export
parent 760fbbb3
...@@ -275,7 +275,7 @@ class _ConfigSQL(object): ...@@ -275,7 +275,7 @@ class _ConfigSQL(object):
def toDict(self): def toDict(self):
storage = {} storage = {}
for k, v in self.__dict__.items(): for k, v in self.__dict__.items():
if k[0] != '_' or k.endswith("password"): if k[0] != '_' and not k.endswith("password") and not k.endswith("secret"):
storage[k] = v storage[k] = v
return storage return storage
......
...@@ -49,6 +49,13 @@ class _Logger(logging.Logger): ...@@ -49,6 +49,13 @@ class _Logger(logging.Logger):
else: else:
self.error(message, stacklevel=2, *args, **kwargs) self.error(message, stacklevel=2, *args, **kwargs)
def debug_no_auth(self, message, *args, **kwargs):
if message.startswith("send: AUTH"):
self.debug(message[:16], stacklevel=2, *args, **kwargs)
else:
self.debug(message, stacklevel=2, *args, **kwargs)
def get(name=None): def get(name=None):
return logging.getLogger(name) return logging.getLogger(name)
......
...@@ -66,9 +66,15 @@ class TaskConvert(CalibreTask): ...@@ -66,9 +66,15 @@ class TaskConvert(CalibreTask):
# if we're sending to kindle after converting, create a one-off task and run it immediately # if we're sending to kindle after converting, create a one-off task and run it immediately
# todo: figure out how to incorporate this into the progress # todo: figure out how to incorporate this into the progress
try: try:
worker_thread.add(self.user, TaskEmail(self.settings['subject'], self.results["path"], worker_thread.add(self.user, TaskEmail(self.settings['subject'],
filename, self.settings, self.kindle_mail, self.results["path"],
self.settings['subject'], self.settings['body'], internal=True)) filename,
self.settings,
self.kindle_mail,
self.settings['subject'],
self.settings['body'],
internal=True)
)
except Exception as e: except Exception as e:
return self._handleError(str(e)) return self._handleError(str(e))
......
...@@ -44,7 +44,7 @@ class EmailBase: ...@@ -44,7 +44,7 @@ class EmailBase:
def send(self, strg): def send(self, strg):
"""Send `strg' to the server.""" """Send `strg' to the server."""
log.debug('send: %r', strg[:300]) log.debug_no_auth('send: {}'.format(strg[:300]))
if hasattr(self, 'sock') and self.sock: if hasattr(self, 'sock') and self.sock:
try: try:
if self.transferSize: if self.transferSize:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment