summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-10-29 12:53:57 -0400
committerGitHub <noreply@github.com>2020-10-29 12:53:57 -0400
commit8b42a4eefda409dfef9a3d10c9f55a778cae46a1 (patch)
tree91e4cc793d4d7bd5a96273f611847786e3c462cb /changelog.d
parentAdd ability for access tokens to belong to one user but grant access to anoth... (diff)
downloadsynapse-8b42a4eefda409dfef9a3d10c9f55a778cae46a1.tar.xz
Gracefully handle a pending logging connection during shutdown. (#8685)
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/8607.feature1
-rw-r--r--changelog.d/8607.misc1
-rw-r--r--changelog.d/8685.feature1
3 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/8607.feature b/changelog.d/8607.feature
new file mode 100644
index 0000000000..fef1eccb92
--- /dev/null
+++ b/changelog.d/8607.feature
@@ -0,0 +1 @@
+Support generating structured logs via the standard logging configuration.
diff --git a/changelog.d/8607.misc b/changelog.d/8607.misc
deleted file mode 100644
index 9e56551a34..0000000000
--- a/changelog.d/8607.misc
+++ /dev/null
@@ -1 +0,0 @@
-Re-organize the structured logging code to separate the TCP transport handling from the JSON formatting.
diff --git a/changelog.d/8685.feature b/changelog.d/8685.feature
new file mode 100644
index 0000000000..fef1eccb92
--- /dev/null
+++ b/changelog.d/8685.feature
@@ -0,0 +1 @@
+Support generating structured logs via the standard logging configuration.