summary refs log tree commit diff
path: root/synapse/events/spamcheck.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-24 15:02:25 +0100
committerErik Johnston <erik@matrix.org>2017-10-24 15:02:25 +0100
commitf009df23ec711e943d958bb0a0e3185d42d7cc79 (patch)
tree30fa4558fe72f9429b0d533d12653dc786ad9692 /synapse/events/spamcheck.py
parentMerge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff)
parentBump version and changelog (diff)
downloadsynapse-f009df23ec711e943d958bb0a0e3185d42d7cc79.tar.xz
Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1
Diffstat (limited to 'synapse/events/spamcheck.py')
-rw-r--r--synapse/events/spamcheck.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/spamcheck.py b/synapse/events/spamcheck.py
index dccc579eac..633e068eb8 100644
--- a/synapse/events/spamcheck.py
+++ b/synapse/events/spamcheck.py
@@ -22,7 +22,7 @@ class SpamChecker(object):
         config = None
         try:
             module, config = hs.config.spam_checker
-        except:
+        except Exception:
             pass
 
         if module is not None: