From 29e3390fb965bf8056114aa86a4fb408224bf00c Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 1 Mar 2019 16:11:32 -0500 Subject: [PATCH] re-use log_call_deferred where it is easy to do so --- src/allmydata/frontends/magic_folder.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 00cf23ba4..d608fd1c5 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -1965,17 +1965,15 @@ class Downloader(QueueMixin, WriteFileMixin): if item.metadata.get('deleted', False): d.addCallback(lambda ign: self._rename_deleted_file(abspath_u)) else: - @eliotutil.inline_callbacks + @eliotutil.log_call_deferred(DOWNLOAD_BEST_VERSION.action_type) def download_best_version(ignored): - with DOWNLOAD_BEST_VERSION(): - contents = yield item.file_node.download_best_version(progress=item.progress) - defer.returnValue( - self._write_downloaded_file( - self._local_path_u, abspath_u, contents, - is_conflict=is_conflict, - mtime=item.metadata.get('user_mtime', item.metadata.get('tahoe', {}).get('linkmotime')), - ) - ) + d = DeferredContext(item.file_node.download_best_version(progress=item.progress)) + d.addCallback(lambda contents: self._write_downloaded_file( + self._local_path_u, abspath_u, contents, + is_conflict=is_conflict, + mtime=item.metadata.get('user_mtime', item.metadata.get('tahoe', {}).get('linkmotime')), + )) + return d.result d.addCallback(download_best_version)