mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-24 03:05:48 +00:00
Merge branch 'release-v1.13.0' into develop
This commit is contained in:
commit
15aa09bbe6
11
MANIFEST.in
11
MANIFEST.in
@ -30,23 +30,24 @@ recursive-include synapse/static *.gif
|
|||||||
recursive-include synapse/static *.html
|
recursive-include synapse/static *.html
|
||||||
recursive-include synapse/static *.js
|
recursive-include synapse/static *.js
|
||||||
|
|
||||||
exclude Dockerfile
|
exclude .codecov.yml
|
||||||
|
exclude .coveragerc
|
||||||
exclude .dockerignore
|
exclude .dockerignore
|
||||||
exclude test_postgresql.sh
|
|
||||||
exclude .editorconfig
|
exclude .editorconfig
|
||||||
|
exclude Dockerfile
|
||||||
|
exclude mypy.ini
|
||||||
exclude sytest-blacklist
|
exclude sytest-blacklist
|
||||||
|
exclude test_postgresql.sh
|
||||||
|
|
||||||
include pyproject.toml
|
include pyproject.toml
|
||||||
recursive-include changelog.d *
|
recursive-include changelog.d *
|
||||||
|
|
||||||
prune .buildkite
|
prune .buildkite
|
||||||
prune .circleci
|
prune .circleci
|
||||||
prune .codecov.yml
|
|
||||||
prune .coveragerc
|
|
||||||
prune .github
|
prune .github
|
||||||
|
prune contrib
|
||||||
prune debian
|
prune debian
|
||||||
prune demo/etc
|
prune demo/etc
|
||||||
prune docker
|
prune docker
|
||||||
prune mypy.ini
|
|
||||||
prune snap
|
prune snap
|
||||||
prune stubs
|
prune stubs
|
||||||
|
1
changelog.d/7401.feature
Normal file
1
changelog.d/7401.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Add support for running replication over Redis when using workers.
|
1
changelog.d/7404.misc
Normal file
1
changelog.d/7404.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Fix issues with the Python package manifest.
|
@ -22,7 +22,10 @@ class RedisProtocol:
|
|||||||
def publish(self, channel: str, message: bytes): ...
|
def publish(self, channel: str, message: bytes): ...
|
||||||
|
|
||||||
class SubscriberProtocol:
|
class SubscriberProtocol:
|
||||||
|
password: Optional[str]
|
||||||
def subscribe(self, channels: Union[str, List[str]]): ...
|
def subscribe(self, channels: Union[str, List[str]]): ...
|
||||||
|
def connectionMade(self): ...
|
||||||
|
def connectionLost(self, reason): ...
|
||||||
|
|
||||||
def lazyConnection(
|
def lazyConnection(
|
||||||
host: str = ...,
|
host: str = ...,
|
||||||
|
@ -61,6 +61,7 @@ class RedisSubscriber(txredisapi.SubscriberProtocol, AbstractConnection):
|
|||||||
outbound_redis_connection = None # type: txredisapi.RedisProtocol
|
outbound_redis_connection = None # type: txredisapi.RedisProtocol
|
||||||
|
|
||||||
def connectionMade(self):
|
def connectionMade(self):
|
||||||
|
super().connectionMade()
|
||||||
logger.info("Connected to redis instance")
|
logger.info("Connected to redis instance")
|
||||||
self.subscribe(self.stream_name)
|
self.subscribe(self.stream_name)
|
||||||
self.send_command(ReplicateCommand())
|
self.send_command(ReplicateCommand())
|
||||||
@ -119,6 +120,7 @@ class RedisSubscriber(txredisapi.SubscriberProtocol, AbstractConnection):
|
|||||||
logger.warning("Unhandled command: %r", cmd)
|
logger.warning("Unhandled command: %r", cmd)
|
||||||
|
|
||||||
def connectionLost(self, reason):
|
def connectionLost(self, reason):
|
||||||
|
super().connectionLost(reason)
|
||||||
logger.info("Lost connection to redis instance")
|
logger.info("Lost connection to redis instance")
|
||||||
self.handler.lost_connection(self)
|
self.handler.lost_connection(self)
|
||||||
|
|
||||||
@ -189,5 +191,6 @@ class RedisDirectTcpReplicationClientFactory(txredisapi.SubscriberFactory):
|
|||||||
p.handler = self.handler
|
p.handler = self.handler
|
||||||
p.outbound_redis_connection = self.outbound_redis_connection
|
p.outbound_redis_connection = self.outbound_redis_connection
|
||||||
p.stream_name = self.stream_name
|
p.stream_name = self.stream_name
|
||||||
|
p.password = self.password
|
||||||
|
|
||||||
return p
|
return p
|
||||||
|
Loading…
Reference in New Issue
Block a user