Don't try to use a txn when not in one, remove spurious debug logging

This commit is contained in:
Mark Haines
2015-05-21 16:53:03 +01:00
parent 53447e9cd3
commit 2043527b9b
2 changed files with 1 additions and 5 deletions
-2
View File
@@ -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",
+1 -3
View File
@@ -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):