From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 14 Dec 2015 22:08:31 +0000 (+0000)
Subject: Delay only the download scan not the turning of our event queue.
X-Git-Url: https://git.rkrishnan.org/pf/vdrive/index.html?a=commitdiff_plain;h=44cc039aa3a503d3de094db2dbec1d5ac7f65286;p=tahoe-lafs%2Ftahoe-lafs.git
Delay only the download scan not the turning of our event queue.
Author: David Stainton <david@leastauthority.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index 8288ea6b..353b8fac 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -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