ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 07:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More debug logging.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2015-10-22 14:27:39 +01:00 committed by Brian Warner
parent 57753a62bc
commit 5d5d804719
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,10 @@ class QueueMixin(HookMixin):
self._log("%s += %r" % (counter_name, delta)) self._log("%s += %r" % (counter_name, delta))
self._client.stats_provider.count(ctr, delta) self._client.stats_provider.count(ctr, delta)
def _logcb(self, res, msg):
self._log("%s: %r" % (msg, res))
return res
def _log(self, msg): def _log(self, msg):
s = "Magic Folder %s %s: %s" % (quote_output(self._client.nickname), self._name, msg) s = "Magic Folder %s %s: %s" % (quote_output(self._client.nickname), self._name, msg)
self._client.log(s) self._client.log(s)
@ -150,10 +154,13 @@ class QueueMixin(HookMixin):
self._clock.callLater(0, self._turn_deque) self._clock.callLater(0, self._turn_deque)
def _turn_deque(self): def _turn_deque(self):
self._log("_turn_deque")
if self._stopped: if self._stopped:
self._log("stopped")
return return
try: try:
item = self._deque.pop() item = self._deque.pop()
self._log("popped %r" % (item,))
self._count('objects_queued', -1) self._count('objects_queued', -1)
except IndexError: except IndexError:
self._log("deque is now empty") self._log("deque is now empty")
@ -496,9 +503,13 @@ class Downloader(QueueMixin, WriteFileMixin):
We check the remote metadata version against our magic-folder db version number; We check the remote metadata version against our magic-folder db version number;
latest version wins. latest version wins.
""" """
self._log("_should_download(%r, %r)" % (relpath_u, remote_version))
if magicpath.should_ignore_file(relpath_u): if magicpath.should_ignore_file(relpath_u):
self._log("nope")
return False return False
self._log("yep")
v = self._db.get_local_file_version(relpath_u) v = self._db.get_local_file_version(relpath_u)
self._log("v = %r" % (v,))
return (v is None or v < remote_version) return (v is None or v < remote_version)
def _get_local_latest(self, relpath_u): def _get_local_latest(self, relpath_u):
@ -564,6 +575,7 @@ class Downloader(QueueMixin, WriteFileMixin):
self._log("%r added to download queue" % (relpath_u,)) self._log("%r added to download queue" % (relpath_u,))
self._append_to_batch(relpath_u, file_node, metadata) self._append_to_batch(relpath_u, file_node, metadata)
d.addCallback(scan_listing) d.addCallback(scan_listing)
d.addBoth(self._logcb, "end of _scan_remote")
return d return d
def _scan_remote_collective(self): def _scan_remote_collective(self):
@ -600,6 +612,7 @@ class Downloader(QueueMixin, WriteFileMixin):
self._log("pending after = %r" % (self._pending,)) self._log("pending after = %r" % (self._pending,))
def _filter_scan_batch(self, result): def _filter_scan_batch(self, result):
self._log("_filter_scan_batch")
extension = [] # consider whether this should be a dict extension = [] # consider whether this should be a dict
for relpath_u in self._download_scan_batch.keys(): for relpath_u in self._download_scan_batch.keys():
if relpath_u in self._pending: if relpath_u in self._pending:
@ -611,6 +624,7 @@ class Downloader(QueueMixin, WriteFileMixin):
def _when_queue_is_empty(self): def _when_queue_is_empty(self):
d = task.deferLater(self._clock, self._turn_delay, self._scan_remote_collective) d = task.deferLater(self._clock, self._turn_delay, self._scan_remote_collective)
d.addBoth(self._logcb, "after _scan_remote_collective")
d.addCallback(lambda ign: self._turn_deque()) d.addCallback(lambda ign: self._turn_deque())
return d return d