tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/push/__init__.py
View file

@ -287,8 +287,6 @@ class Pusher(object):
logger.warn("Neither notify nor dont_notify in actions: adding default") logger.warn("Neither notify nor dont_notify in actions: adding default")
actions.extend(Pusher.DEFAULT_ACTIONS) actions.extend(Pusher.DEFAULT_ACTIONS)
logger.info("FNARG: %r", actions)
if 'dont_notify' in actions: if 'dont_notify' in actions:
logger.debug( logger.debug(
"%s for %s: dont_notify", "%s for %s: dont_notify",

4
synapse/storage/push_rule.py
View file

@ -218,9 +218,7 @@ class PushRuleStore(SQLBaseStore):
{'enabled': 1 if enabled else 0}, {'enabled': 1 if enabled else 0},
desc="set_push_rule_enabled", 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): class RuleNotFoundException(Exception):