startService can be called more than once.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 8 Sep 2015 14:29:13 +0000 (15:29 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 15 Sep 2015 17:43:00 +0000 (18:43 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py

index 2b2b9ffd925f590f70e27c56f7319095ced3551c..b748d5158a565c31986df9aaab079dc40d2fa735 100644 (file)
@@ -64,6 +64,10 @@ class MagicFolder(service.MultiService):
         self.downloader = Downloader(client, local_path_u, db, collective_dircap)
 
     def startService(self):
+        # TODO: why is this being called more than once?
+        if self.running:
+            return defer.succeed(None)
+        #print "%r.startService" % (self,)
         service.MultiService.startService(self)
         return self.uploader.start_monitoring()