From 4cee83f733238e5ebed6b8083158c6df3ad98f54 Mon Sep 17 00:00:00 2001 From: Denis Costa Date: Wed, 19 Oct 2016 14:46:05 -0200 Subject: [bug] Fix warning logging. Following Twisted documentation, I found out that the warning method doesn't exist on logger class. That class has warn method instead. And I got a error because of that. https://twistedmatrix.com/documents/16.4.1/api/twisted.logger.Logger.html --- src/leap/bitmask/core/mail_services.py | 2 +- src/leap/bitmask/mail/adaptors/soledad.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index c5a66366..4dc9eede 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -582,7 +582,7 @@ class StandardMailService(service.MultiService, HookableService): try: shutil.rmtree(tokens_folder) except OSError as e: - logger.warning("Can't remove tokens folder %s: %s" + logger.warn("Can't remove tokens folder %s: %s" % (tokens_folder, e)) return os.mkdir(tokens_folder, 0700) diff --git a/src/leap/bitmask/mail/adaptors/soledad.py b/src/leap/bitmask/mail/adaptors/soledad.py index 665cef23..cd6c42f8 100644 --- a/src/leap/bitmask/mail/adaptors/soledad.py +++ b/src/leap/bitmask/mail/adaptors/soledad.py @@ -505,7 +505,7 @@ class MessageWrapper(object): for (key, doc) in cdocs.items()]) for doc_id, cdoc in zip(self.mdoc.cdocs, self.cdocs.values()): if cdoc.raw == "": - logger.warning("Empty raw field in cdoc %s" % doc_id) + logger.warn("Empty raw field in cdoc %s" % doc_id) cdoc.set_future_doc_id(doc_id) def create(self, store, notify_just_mdoc=False, pending_inserts_dict=None): @@ -1126,7 +1126,7 @@ class SoledadMailAdaptor(SoledadIndexMixin): def get_mdoc_id(hdoc): if not hdoc: - logger.warning("Could not find a HDOC with MSGID %s" % msgid) + logger.warn("Could not find a HDOC with MSGID %s" % msgid) return None hdoc = hdoc[0] mdoc_id = hdoc.doc_id.replace("H-", "M-%s-" % uuid) -- cgit v1.2.3