diff options
| author | Erik Johnston <erik@matrix.org> | 2020-04-29 16:23:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 16:23:08 +0100 |
| commit | 37f6823f5b91f27b9dd8de8fc0e52d5ea889647c (patch) | |
| tree | df9a392c3b1d4470185dcfb90e63c1005ef4e4bb /synapse/app/_base.py | |
| parent | Don't relay REMOTE_SERVER_UP cmds to same conn. (#7352) (diff) | |
| download | synapse-37f6823f5b91f27b9dd8de8fc0e52d5ea889647c.tar.xz | |
Add instance name to RDATA/POSITION commands (#7364)
This is primarily for allowing us to send those commands from workers, but for now simply allows us to ignore echoed RDATA/POSITION commands that we sent (we get echoes of sent commands when using redis). Currently we log a WARNING on the master process every time we receive an echoed RDATA.
Diffstat (limited to 'synapse/app/_base.py')
| -rw-r--r-- | synapse/app/_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 4d84f4595a..628292b890 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -270,7 +270,7 @@ def start(hs, listeners=None): # Start the tracer synapse.logging.opentracing.init_tracer( # type: ignore[attr-defined] # noqa - hs.config + hs ) # It is now safe to start your Synapse. @@ -316,7 +316,7 @@ def setup_sentry(hs): scope.set_tag("matrix_server_name", hs.config.server_name) app = hs.config.worker_app if hs.config.worker_app else "synapse.app.homeserver" - name = hs.config.worker_name if hs.config.worker_name else "master" + name = hs.get_instance_name() scope.set_tag("worker_app", app) scope.set_tag("worker_name", name) |