From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 8 Sep 2015 14:29:13 +0000 (+0100)
Subject: startService can be called more than once.
X-Git-Url: https://git.rkrishnan.org/about.html?a=commitdiff_plain;h=0aa0a7452d3cef17d2b514baf9b1fc964b60aa03;p=tahoe-lafs%2Ftahoe-lafs.git

startService can be called more than once.

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 652c581a..28618ca3 100644
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -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()