From 26f5a1c8b1c85e85ea390cd10421d17ef2cc9118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Thu, 29 Aug 2013 17:45:36 -0300 Subject: Actually save the doc in couch --- src/leap/mx/mail_receiver.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/leap/mx') diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index 77e7cf4..cabb5cb 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -168,6 +168,7 @@ class MailReceiver(Service): uuid = 0 db = CouchDatabase(self._mail_couch_url, "user-%s" % (uuid,)) + db.put_doc(doc) log.msg("Done exporting") -- cgit v1.2.3 From 78f6ca775dc42eba69f2dc1e134ca360c0813aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 30 Aug 2013 12:29:33 -0300 Subject: Keep file watcher in memory to prevent losing file events --- src/leap/mx/mail_receiver.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/leap/mx') diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index 77e7cf4..8c39353 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -72,16 +72,16 @@ class MailReceiver(Service): Starts the MailReceiver service """ Service.startService(self) - wm = inotify.INotify() - wm.startReading() + self.wm = inotify.INotify() + self.wm.startReading() mask = inotify.IN_CREATE for directory, recursive in self._directories: log.msg("Watching %s --- Recursive: %s" % (directory, recursive)) - wm.watch(filepath.FilePath(directory), mask, - callbacks=[self._process_incoming_email], - recursive=recursive) + self.wm.watch(filepath.FilePath(directory), mask, + callbacks=[self._process_incoming_email], + recursive=recursive) def _gather_uuid_pubkey(self, results): if len(results) < 2: -- cgit v1.2.3 From 551a4d7bd1630847333ba67b8609491372230540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Sat, 31 Aug 2013 16:31:48 -0300 Subject: Properly parse mail address --- src/leap/mx/mail_receiver.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/leap/mx') diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py index 77e7cf4..6f9b8a7 100644 --- a/src/leap/mx/mail_receiver.py +++ b/src/leap/mx/mail_receiver.py @@ -24,6 +24,7 @@ import os import uuid as pyuuid import json +import email.utils from email import message_from_string @@ -218,6 +219,7 @@ class MailReceiver(Service): "Delivered-To: field") log.msg("Mail owner: %s" % (owner,)) + owner = email.utils.parseaddr(owner)[1] log.msg("%s received a new mail" % (owner,)) dpubk = self._users_cdb.getPubKey(owner) duuid = self._users_cdb.queryByAddress(owner) -- cgit v1.2.3