OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove some redundant patches from the hotfixes branch

anoa/log_11772
Richard van der Hoff 2021-08-26 09:45:19 +01:00
parent fe3466a8ad
commit ac646fed06
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/handlers/room_list.py
View File

@ -47,7 +47,6 @@ class RoomListHandler(BaseHandler):
def __init__(self, hs: "HomeServer"): def __init__(self, hs: "HomeServer"):
super().__init__(hs) super().__init__(hs)
self.enable_room_list_search = hs.config.enable_room_list_search self.enable_room_list_search = hs.config.enable_room_list_search
self.response_cache: ResponseCache[ self.response_cache: ResponseCache[
Tuple[Optional[int], Optional[str], Optional[ThirdPartyInstanceID]] Tuple[Optional[int], Optional[str], Optional[ThirdPartyInstanceID]]
] = ResponseCache(hs.get_clock(), "room_list") ] = ResponseCache(hs.get_clock(), "room_list")

1
synapse/handlers/sync.py
View File

@ -61,7 +61,6 @@ logger = logging.getLogger(__name__)
# Debug logger for https://github.com/matrix-org/synapse/issues/4422 # Debug logger for https://github.com/matrix-org/synapse/issues/4422
issue4422_logger = logging.getLogger("synapse.handler.sync.4422_debug") issue4422_logger = logging.getLogger("synapse.handler.sync.4422_debug")
SYNC_RESPONSE_CACHE_MS = 2 * 60 * 1000
# Counts the number of times we returned a non-empty sync. `type` is one of # Counts the number of times we returned a non-empty sync. `type` is one of
# "initial_sync", "full_state_sync" or "incremental_sync", `lazy_loaded` is # "initial_sync", "full_state_sync" or "incremental_sync", `lazy_loaded` is

5
synapse/storage/background_updates.py
View File

@ -84,9 +84,8 @@ class BackgroundUpdater:
MINIMUM_BACKGROUND_BATCH_SIZE = 100 MINIMUM_BACKGROUND_BATCH_SIZE = 100
DEFAULT_BACKGROUND_BATCH_SIZE = 100 DEFAULT_BACKGROUND_BATCH_SIZE = 100
# temporarily increased to make stream_ordering go faster: rv 2021/06/29 BACKGROUND_UPDATE_INTERVAL_MS = 1000
BACKGROUND_UPDATE_INTERVAL_MS = 10 BACKGROUND_UPDATE_DURATION_MS = 100
BACKGROUND_UPDATE_DURATION_MS = 1000
def __init__(self, hs: "HomeServer", database: "DatabasePool"): def __init__(self, hs: "HomeServer", database: "DatabasePool"):
self._clock = hs.get_clock() self._clock = hs.get_clock()