diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-01 15:12:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-01 15:12:57 +0100 |
| commit | 67362a9a034a9a8945c10faf78e9b13598e3dc9e (patch) | |
| tree | c523d50061b18df57d33397dfdfb586fd267bbdd /synapse/util/__init__.py | |
| parent | clarify readme a bit more (diff) | |
| parent | Bump changelog and version to v0.9.3 (diff) | |
| download | synapse-67362a9a034a9a8945c10faf78e9b13598e3dc9e.tar.xz | |
Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3
Diffstat (limited to 'synapse/util/__init__.py')
| -rw-r--r-- | synapse/util/__init__.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 260714ccc2..07ff25cef3 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -91,8 +91,12 @@ class Clock(object): with PreserveLoggingContext(): return reactor.callLater(delay, wrapped_callback, *args, **kwargs) - def cancel_call_later(self, timer): - timer.cancel() + def cancel_call_later(self, timer, ignore_errs=False): + try: + timer.cancel() + except: + if not ignore_errs: + raise def time_bound_deferred(self, given_deferred, time_out): if given_deferred.called: |