From 94c8add31403e7b9b387b60c1779ad4c8219e537 Mon Sep 17 00:00:00 2001
From: Zaiming Shi <zmstone@gmail.com>
Date: Thu, 6 May 2021 09:47:34 +0200
Subject: [PATCH] chore(config): default log.single_line=true

---
 etc/emqx.conf    |  6 ++----
 priv/emqx.schema | 14 +++-----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/etc/emqx.conf b/etc/emqx.conf
index a5d199421..ef1769a9e 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -449,10 +449,8 @@ log.file = emqx.log
 #log.formatter = text
 
 ## Log to single line
-## Value: formatter_default | true | false
-## 'formatter_default' is equivalent to 'true' when log.formatter is 'json'
-## 'formatter_default' is equivalent to 'false' when log.formatter is 'text'
-#log.single_line = formatter_default
+## Value: Boolean
+#log.single_line = true
 
 ## Enables the log rotation.
 ## With this enabled, new log files will be created when the current
diff --git a/priv/emqx.schema b/priv/emqx.schema
index 9768f5b78..5ecd62de0 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -506,8 +506,8 @@ end}.
 
 %% @doc format logs in a single line.
 {mapping, "log.single_line", "kernel.logger", [
-  {default, formatter_default},
-  {datatype, {enum, [formatter_default, true, false]}}
+  {default, true},
+  {datatype, {enum, [true, false]}}
 ]}.
 
 {mapping, "log.rotation", "kernel.logger", [
@@ -606,16 +606,8 @@ end}.
                      -1 -> unlimited;
                      V -> V
                  end,
-    SingleLine0 = cuttlefish:conf_get("log.single_line", Conf),
+    SingleLine = cuttlefish:conf_get("log.single_line", Conf),
     FmtName = cuttlefish:conf_get("log.formatter", Conf),
-    SingleLine = case SingleLine0 =:= formatter_default of
-                     true when FmtName =:= text ->
-                         false;
-                     true when FmtName =:= json ->
-                         true;
-                     false ->
-                         SingleLine0
-                 end,
     Formatter =
     case FmtName of
         json ->