From 6543296467656a99a9934c6922235a6f1feb624d Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 Dec 2019 10:50:18 +0000
Subject: Emit log messages as 'message' not 'log'.

---
 synapse/logging/_terse_json.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse')

diff --git a/synapse/logging/_terse_json.py b/synapse/logging/_terse_json.py
index 03934956f4..d49dccdc08 100644
--- a/synapse/logging/_terse_json.py
+++ b/synapse/logging/_terse_json.py
@@ -76,9 +76,9 @@ def flatten_event(event: dict, metadata: dict, include_time: bool = False):
     # context only given in the log format (e.g. what is being logged) is
     # available.
     if "log_text" in event:
-        new_event["log"] = event["log_text"]
+        new_event["message"] = event["log_text"]
     else:
-        new_event["log"] = event["log_format"]
+        new_event["message"] = event["log_format"]
 
     # We want to include the timestamp when forwarding over the network, but
     # exclude it when we are writing to stdout. This is because the log ingester
-- 
cgit 1.5.1