From 2043527b9bbea019b8a4ffddcc9e82438d12b1d5 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 21 May 2015 16:53:03 +0100
Subject: [PATCH] Don't try to use a txn when not in one, remove spurious debug
logging
---
synapse/push/__init__.py | 2 --
synapse/storage/push_rule.py | 4 +---
2 files changed, 1 insertion(+), 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):
--
GitLab