summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-30 19:43:54 +0200
committerKali Kaneko <kali@leap.se>2013-08-30 19:43:54 +0200
commit618f13ab5f8ce41b2065289ae341cce7e0674854 (patch)
tree98308863b05dd583130c05d0b2ffb6a1cfeeee3c
parent65ac6c78ad4be4cb8c7cb9b20f69b35bfcdb83c7 (diff)
parent78f6ca775dc42eba69f2dc1e134ca360c0813aff (diff)
Merge remote-tracking branch 'chiiph/bug/keep_watcher_in_memory' into develop
-rw-r--r--changes/bug_keep_watcher_in_memory1
-rw-r--r--src/leap/mx/mail_receiver.py10
2 files changed, 6 insertions, 5 deletions
diff --git a/changes/bug_keep_watcher_in_memory b/changes/bug_keep_watcher_in_memory
new file mode 100644
index 0000000..4ac9541
--- /dev/null
+++ b/changes/bug_keep_watcher_in_memory
@@ -0,0 +1 @@
+ o Keep file watcher in memory to prevent losing file events. \ No newline at end of file
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py
index cabb5cb..24ba2fe 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: