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

it's okay if we already cancelled it

Browse Source
This commit is contained in:
meejah 2016-09-08 10:00:33 -06:00 committed by Brian Warner
parent 622ae646b1
commit de8e61ddf1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ from datetime import datetime
import time
from twisted.internet import defer, reactor, task
from twisted.internet.error import AlreadyCancelled
from twisted.python.failure import Failure
from twisted.python import runtime
from twisted.python import log as twlog
@ -382,7 +383,10 @@ class Uploader(QueueMixin):
self._notifier.stopReading()
self._count('dirs_monitored', -1)
if self._periodic_callid:
self._periodic_callid.cancel()
try:
self._periodic_callid.cancel()
except AlreadyCancelled:
pass
if hasattr(self._notifier, 'wait_until_stopped'):
d = self._notifier.wait_until_stopped()