From fb56dfdccd129ecdc07effbb6e2e18d3b304d821 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:42:07 +0000
Subject: [PATCH] Fix SIGHUP handler (#8697)
Fixes:
```
builtins.TypeError: _reload_logging_config() takes 1 positional argument but 2 were given
```
---
changelog.d/8697.misc | 1 +
synapse/app/_base.py | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 changelog.d/8697.misc
diff --git a/changelog.d/8697.misc b/changelog.d/8697.misc
new file mode 100644
index 0000000000..7982a4e46d
--- /dev/null
+++ b/changelog.d/8697.misc
@@ -0,0 +1 @@
+ Re-organize the structured logging code to separate the TCP transport handling from the JSON formatting.
diff --git a/synapse/app/_base.py b/synapse/app/_base.py
index f6f7b2bf42..9c8dc785c6 100644
--- a/synapse/app/_base.py
+++ b/synapse/app/_base.py
@@ -49,7 +49,6 @@ def register_sighup(func, *args, **kwargs):
Args:
func (function): Function to be called when sent a SIGHUP signal.
- Will be called with a single default argument, the homeserver.
*args, **kwargs: args and kwargs to be passed to the target function.
"""
_sighup_callbacks.append((func, args, kwargs))
@@ -251,13 +250,13 @@ def start(hs: "synapse.server.HomeServer", listeners: Iterable[ListenerConfig]):
sdnotify(b"RELOADING=1")
for i, args, kwargs in _sighup_callbacks:
- i(hs, *args, **kwargs)
+ i(*args, **kwargs)
sdnotify(b"READY=1")
signal.signal(signal.SIGHUP, handle_sighup)
- register_sighup(refresh_certificate)
+ register_sighup(refresh_certificate, hs)
# Load the certificate from disk.
refresh_certificate(hs)
--
GitLab