diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index 2d231e31ea..c1a895e28c 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -37,35 +37,39 @@ def decode_rule_json(rule): @defer.inlineCallbacks def _get_rules(room_id, user_ids, store): - rules_by_user = yield store.bulk_get_push_rules(user_ids) - rules_enabled_by_user = yield store.bulk_get_push_rules_enabled(user_ids) + with log_duration("bulk_get_push_rules"): + rules_by_user = yield store.bulk_get_push_rules(user_ids) + with log_duration("bulk_get_push_rules_enabled"): + rules_enabled_by_user = yield store.bulk_get_push_rules_enabled(user_ids) - rules_by_user = { - uid: list_with_base_rules([ - decode_rule_json(rule_list) - for rule_list in rules_by_user.get(uid, []) - ]) - for uid in user_ids - } + with log_duration("list_with_base_rules"): + rules_by_user = { + uid: list_with_base_rules([ + decode_rule_json(rule_list) + for rule_list in rules_by_user.get(uid, []) + ]) + for uid in user_ids + } # We apply the rules-enabled map here: bulk_get_push_rules doesn't # fetch disabled rules, but this won't account for any server default # rules the user has disabled, so we need to do this too. - for uid in user_ids: - if uid not in rules_enabled_by_user: - continue + with log_duration("apply_the_rules_enabled"): + for uid in user_ids: + if uid not in rules_enabled_by_user: + continue - user_enabled_map = rules_enabled_by_user[uid] + user_enabled_map = rules_enabled_by_user[uid] - for i, rule in enumerate(rules_by_user[uid]): - rule_id = rule['rule_id'] + for i, rule in enumerate(rules_by_user[uid]): + rule_id = rule['rule_id'] - if rule_id in user_enabled_map: - if rule.get('enabled', True) != bool(user_enabled_map[rule_id]): - # Rules are cached across users. - rule = dict(rule) - rule['enabled'] = bool(user_enabled_map[rule_id]) - rules_by_user[uid][i] = rule + if rule_id in user_enabled_map: + if rule.get('enabled', True) != bool(user_enabled_map[rule_id]): + # Rules are cached across users. + rule = dict(rule) + rule['enabled'] = bool(user_enabled_map[rule_id]) + rules_by_user[uid][i] = rule defer.returnValue(rules_by_user)