summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-21 16:53:03 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-21 16:53:03 +0100
commit2043527b9bbea019b8a4ffddcc9e82438d12b1d5 (patch)
treec6b74e6ee0925ba9b31ef2f1fdb0fb1de9dd20ac
parentAdd caches for things requested by the pushers (diff)
downloadsynapse-2043527b9bbea019b8a4ffddcc9e82438d12b1d5.tar.xz
Don't try to use a txn when not in one, remove spurious debug logging
-rw-r--r--synapse/push/__init__.py2
-rw-r--r--synapse/storage/push_rule.py4
2 files changed, 1 insertions, 5 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index d4b376913c..e3dd4ce76d 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -287,8 +287,6 @@ class Pusher(object):
                 logger.warn("Neither notify nor dont_notify in actions: adding default")
                 actions.extend(Pusher.DEFAULT_ACTIONS)
 
-            logger.info("FNARG: %r", actions)
-
             if 'dont_notify' in actions:
                 logger.debug(
                     "%s for %s: dont_notify",
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index fba5c7e403..88ee21b089 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -218,9 +218,7 @@ class PushRuleStore(SQLBaseStore):
             {'enabled': 1 if enabled else 0},
             desc="set_push_rule_enabled",
         )
-        txn.call_after(
-            self.get_push_rules_enabled_for_user.invalidate, user_name
-        )
+        self.get_push_rules_enabled_for_user.invalidate(user_name)
 
 
 class RuleNotFoundException(Exception):