OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix SIGHUP handler (#8697) 

Fixes:

```
builtins.TypeError: _reload_logging_config() takes 1 positional argument but 2 were given
```
pull/8728/head
Richard van der Hoff 2020-11-06 11:42:07 +00:00 committed by GitHub
parent c3119d1536
commit fb56dfdccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8697.misc Normal file
View File

@ -0,0 +1 @@
Re-organize the structured logging code to separate the TCP transport handling from the JSON formatting.

5
synapse/app/_base.py
View File

@ -49,7 +49,6 @@ def register_sighup(func, *args, **kwargs):
Args: Args:
func (function): Function to be called when sent a SIGHUP signal. 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. *args, **kwargs: args and kwargs to be passed to the target function.
""" """
_sighup_callbacks.append((func, args, kwargs)) _sighup_callbacks.append((func, args, kwargs))
@ -251,13 +250,13 @@ def start(hs: "synapse.server.HomeServer", listeners: Iterable[ListenerConfig]):
sdnotify(b"RELOADING=1") sdnotify(b"RELOADING=1")
for i, args, kwargs in _sighup_callbacks: for i, args, kwargs in _sighup_callbacks:
i(hs, *args, **kwargs) i(*args, **kwargs)
sdnotify(b"READY=1") sdnotify(b"READY=1")
signal.signal(signal.SIGHUP, handle_sighup) signal.signal(signal.SIGHUP, handle_sighup)
register_sighup(refresh_certificate) register_sighup(refresh_certificate, hs)
# Load the certificate from disk. # Load the certificate from disk.
refresh_certificate(hs) refresh_certificate(hs)