Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix breaking event sending due to bad push rule #13547

Merged
merged 4 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/13547.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve performance of sending messages in rooms with thousands of local users.
13 changes: 12 additions & 1 deletion synapse/push/baserules.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,16 @@
"""

import itertools
import logging
from typing import Dict, Iterator, List, Mapping, Sequence, Tuple, Union

import attr

from synapse.config.experimental import ExperimentalConfig
from synapse.push.rulekinds import PRIORITY_CLASS_MAP

logger = logging.getLogger(__name__)


@attr.s(auto_attribs=True, slots=True, frozen=True)
class PushRule:
Expand Down Expand Up @@ -199,8 +202,16 @@ def compile_push_rules(rawrules: List[PushRule]) -> PushRules:
collection = rules.sender
elif rule.priority_class == 1:
collection = rules.underride
elif rule.priority_class <= 0:
logger.info(
"Got rule with priority class less than zero, but doesn't override a base rule: %s",
rule,
)
continue
else:
raise Exception(f"Unknown priority class: {rule.priority_class}")
# We log and continue here so as not to break event sending
logger.error("Unknown priority class: %", rule.priority_class)
continue

collection.append(rule)

Expand Down