From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 28 Apr 2015 18:34:39 +0000 (+0100)
Subject: Scan dir when service starts
X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=ccf4b677a571a0e29db651586e21b11177c9d8a1;p=tahoe-lafs%2Ftahoe-lafs.git

Scan dir when service starts

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index a553fe64..8dfc7449 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -93,7 +93,7 @@ class DropUploader(service.MultiService):
         except EnvironmentError:
             raise(Exception("WARNING: magic folder: permission denied on directory %s" % (quoted_path,)))
         except FilenameEncodingError:
-            raise(Esception("WARNING: magic folder: could not list directory %s due to a filename encoding error" % (quoted_path,)))
+            raise(Exception("WARNING: magic folder: could not list directory %s due to a filename encoding error" % (quoted_path,)))
 
         for child in children:
             assert isinstance(child, unicode), child
@@ -117,6 +117,8 @@ class DropUploader(service.MultiService):
         if self._db is None:
             return Failure(Exception('ERROR: Unable to load magic folder db.'))
 
+        self._scan(self._local_path)
+
         service.MultiService.startService(self)
         d = self._notifier.startReading()