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

Simplified _perform_scan conversion

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-25 20:58:31 -05:00
parent ef69bb83f4
commit e820698194
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,13 +458,6 @@ ITERATION = ActionType(
u"A step towards synchronization in one direction.",
)
PERFORM_SCAN = ActionType(
u"magic-folder:perform-scan",
[],
[],
u"Remote storage is being scanned for changes which need to be synchronized.",
)
_COUNT = Field.for_types(
u"count",
[int, long],
@ -1722,22 +1715,21 @@ class Downloader(QueueMixin, WriteFileMixin):
def _scan_delay(self):
return self._poll_interval
@log_call
@eliotutil.inline_callbacks
def _perform_scan(self):
with PERFORM_SCAN():
try:
yield self._scan_remote_collective()
self._status_reporter(
True, 'Magic folder is working',
'Last scan: %s' % self.nice_current_time(),
)
except Exception as e:
twlog.msg("Remote scan failed: %s" % (e,))
self._log("_scan failed: %s" % (repr(e),))
self._status_reporter(
False, 'Remote scan has failed: %s' % str(e),
'Last attempted at %s' % self.nice_current_time(),
)
try:
yield self._scan_remote_collective()
self._status_reporter(
True, 'Magic folder is working',
'Last scan: %s' % self.nice_current_time(),
)
except Exception as e:
write_traceback()
self._status_reporter(
False, 'Remote scan has failed: %s' % str(e),
'Last attempted at %s' % self.nice_current_time(),
)
def _process(self, item):
"""