ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-30 16:13:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

There need be no "debug log".

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-25 14:17:14 -05:00
parent ca82d4f83d
commit 9207e07407
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/frontends/magic_folder.py
View File

@ -386,11 +386,6 @@ class MagicFolder(service.MultiService):
self.set_public_status, poll_interval=downloader_delay)
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.
@ -606,7 +601,6 @@ class QueueMixin(HookMixin):
self._db = db
self._name = name
self._clock = clock
self._debug_log = False
self._logger = None
self._hooks = {
'processed': None,
@ -627,10 +621,6 @@ class QueueMixin(HookMixin):
self._process_history = deque(maxlen=20)
self._in_progress = []
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
@ -763,8 +753,6 @@ 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):

6
src/allmydata/test/test_magic_folder.py
View File

@ -1482,11 +1482,6 @@ 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)
shutil.rmtree(self.basedir, ignore_errors=True)
return d
@ -1593,7 +1588,6 @@ 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)