Delay only the download scan not the turning of our event queue.
authorDaira Hopwood <daira@jacaranda.org>
Mon, 14 Dec 2015 22:08:31 +0000 (22:08 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 25 Jan 2016 15:54:28 +0000 (15:54 +0000)
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

index 8288ea6b6de7e9b774d70436ebb88f87354612fd..353b8facc8d2e2ad14d7448667dd20e8bd180353 100644 (file)
@@ -543,7 +543,6 @@ class Downloader(QueueMixin, WriteFileMixin):
         self._upload_readonly_dircap = upload_readonly_dircap
         self._is_upload_pending = is_upload_pending
         self._umask = umask
-        self._turn_delay = self.REMOTE_SCAN_INTERVAL
 
     def start_scanning(self):
         self._log("start_scanning")
@@ -680,7 +679,7 @@ class Downloader(QueueMixin, WriteFileMixin):
         return d
 
     def _when_queue_is_empty(self):
-        d = task.deferLater(self._clock, self._turn_delay, self._scan_remote_collective)
+        d = task.deferLater(self._clock, self.REMOTE_SCAN_INTERVAL, self._scan_remote_collective)
         d.addBoth(self._logcb, "after _scan_remote_collective 1")
         d.addCallback(lambda ign: self._turn_deque())
         return d