Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:16:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-v1.13.0' into develop

Browse source 
* release-v1.13.0:
  Don't UPGRADE database rows
  RST indenting
  Put rollback instructions in upgrade notes
  Fix changelog typo
  Oh yeah, RST
  Absolute URL it is then
  Fix upgrade notes link
  Provide summary of upgrade issues in changelog. Fix )
  Move next version notes from changelog to upgrade notes
  Changelog fixes
  1.13.0rc1
  Documentation on setting up redis (#7446)
  Rework UI Auth session validation for registration (#7455)
  Fix errors from malformed log line (#7454)
  Drop support for redis.dbid (#7450)
This commit is contained in:
Andrew Morgan 2020-05-11 16:46:33 +01:00
commit 5cf758cdd6
150 changed files with 590 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/replication/tcp/handler.py
View file

@ -119,10 +119,9 @@ class ReplicationCommandHandler:
import txredisapi
logger.info(
"Connecting to redis (host=%r port=%r DBID=%r)",
"Connecting to redis (host=%r port=%r)",
hs.config.redis_host,
hs.config.redis_port,
hs.config.redis_dbid,
)
# We need two connections to redis, one for the subscription stream and
@ -133,7 +132,6 @@ class ReplicationCommandHandler:
outbound_redis_connection = txredisapi.lazyConnection(
host=hs.config.redis_host,
port=hs.config.redis_port,
dbid=hs.config.redis_dbid,
password=hs.config.redis.redis_password,
reconnect=True,
)