Selaa lähdekoodia

Add logging for redis connection setup (#9590)

tags/v1.30.0rc1
Richard van der Hoff 3 vuotta sitten
committed by GitHub
vanhempi
commit
464e5da7b2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 muutettua tiedostoa jossa 39 lisäystä ja 1 poistoa
  1. +1
    -0
      changelog.d/9590.misc
  2. +3
    -1
      stubs/txredisapi.pyi
  3. +35
    -0
      synapse/replication/tcp/redis.py

+ 1
- 0
changelog.d/9590.misc Näytä tiedosto

@@ -0,0 +1 @@
Add logging for redis connection setup.

+ 3
- 1
stubs/txredisapi.pyi Näytä tiedosto

@@ -17,6 +17,8 @@
"""
from typing import Any, List, Optional, Type, Union

from twisted.internet import protocol

class RedisProtocol:
def publish(self, channel: str, message: bytes): ...
async def ping(self) -> None: ...
@@ -52,7 +54,7 @@ def lazyConnection(

class ConnectionHandler: ...

class RedisFactory:
class RedisFactory(protocol.ReconnectingClientFactory):
continueTrying: bool
handler: RedisProtocol
pool: List[RedisProtocol]


+ 35
- 0
synapse/replication/tcp/redis.py Näytä tiedosto

@@ -20,6 +20,10 @@ from typing import TYPE_CHECKING, Generic, Optional, Type, TypeVar, cast
import attr
import txredisapi

from twisted.internet.address import IPv4Address, IPv6Address
from twisted.internet.interfaces import IAddress, IConnector
from twisted.python.failure import Failure

from synapse.logging.context import PreserveLoggingContext, make_deferred_yieldable
from synapse.metrics.background_process_metrics import (
BackgroundProcessLoggingContext,
@@ -253,6 +257,37 @@ class SynapseRedisFactory(txredisapi.RedisFactory):
except Exception:
logger.warning("Failed to send ping to a redis connection")

# ReconnectingClientFactory has some logging (if you enable `self.noisy`), but
# it's rubbish. We add our own here.

def startedConnecting(self, connector: IConnector):
logger.info(
"Connecting to redis server %s", format_address(connector.getDestination())
)
super().startedConnecting(connector)

def clientConnectionFailed(self, connector: IConnector, reason: Failure):
logger.info(
"Connection to redis server %s failed: %s",
format_address(connector.getDestination()),
reason.value,
)
super().clientConnectionFailed(connector, reason)

def clientConnectionLost(self, connector: IConnector, reason: Failure):
logger.info(
"Connection to redis server %s lost: %s",
format_address(connector.getDestination()),
reason.value,
)
super().clientConnectionLost(connector, reason)


def format_address(address: IAddress) -> str:
if isinstance(address, (IPv4Address, IPv6Address)):
return "%s:%i" % (address.host, address.port)
return str(address)


class RedisDirectTcpReplicationClientFactory(SynapseRedisFactory):
"""This is a reconnecting factory that connects to redis and immediately


Ladataan…
Peruuta
Tallenna