Merge branch 'pr369'

Closes tahoe-lafs/tahoe-lafs#369

src/allmydata/frontends/magic_folder.py

@@ -86,6 +86,11 @@ class MagicFolder(service.MultiService):
                                      self.set_public_status)
         self._public_status = (False, ['Magic folder has not yet started'])
 
+    def enable_debug_log(self, enabled=True):
+        twlog.msg("enable debug log: %s" % enabled)
+        self.uploader.enable_debug_log(enabled)
+        self.downloader.enable_debug_log(enabled)
+
     def get_public_status(self):
         """
         For the web UI, basically.
@@ -135,6 +140,8 @@ class QueueMixin(HookMixin):
         self._db = db
         self._name = name
         self._clock = clock
+        self._debug_log = False
+        self._logger = None
         self._hooks = {
             'processed': None,
             'started': None,
@@ -165,6 +172,10 @@ class QueueMixin(HookMixin):
         # far)
         self._processing = defer.succeed(None)
 
+    def enable_debug_log(self, enabled=True):
+        twlog.msg("queue mixin enable debug logging: %s" % enabled)
+        self._debug_log = enabled
+
     def get_status(self):
         """
         Returns an iterable of instances that implement IQueuedItem
@@ -274,7 +285,8 @@ class QueueMixin(HookMixin):
     def _log(self, msg):
         s = "Magic Folder %s %s: %s" % (quote_output(self._client.nickname), self._name, msg)
         self._client.log(s)
-
+        if self._debug_log:
+            twlog.msg(s)
 
 # this isn't in interfaces.py because it's very specific to QueueMixin
 class IQueuedItem(Interface):

src/allmydata/test/test_magic_folder.py

@@ -2,10 +2,6 @@
 import os, sys, time
 import shutil, simplejson
 
-if False:
-    from twisted.internet.base import DelayedCall
-    DelayedCall.debug = True
-
 from twisted.trial import unittest
 from twisted.internet import defer, task, reactor
 
@@ -1032,6 +1028,11 @@ class SingleMagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Reall
 
     def tearDown(self):
         d = super(SingleMagicFolderTestMixin, self).tearDown()
+        def _disable_debugging(res):
+            if self.magicfolder:
+                self.magicfolder.enable_debug_log(False)
+            return res
+        d.addBoth(_disable_debugging)
         d.addCallback(self.cleanup)
         return d
 
@@ -1137,6 +1138,7 @@ class SingleMagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Reall
         into the magic folder, so we upload the file and record the
         directory. (XXX split to separate test)
         """
+        self.magicfolder.enable_debug_log()
         empty_tree_name = self.unicode_or_fallback(u"empty_tr\u00EAe", u"empty_tree")
         empty_tree_dir = abspath_expanduser_unicode(empty_tree_name, base=self.basedir)
         new_empty_tree_dir = abspath_expanduser_unicode(empty_tree_name, base=self.local_dir)