Prechádzať zdrojové kódy

fix(logging): add line-break after each JSON log

Zaiming Shi 4 rokov pred
rodič
commit
3a2e177be5
3 zmenil súbory, kde vykonal 8 pridanie a 3 odobranie
  1. 1 1
      src/emqx.app.src
  2. 6 1
      src/emqx.appup.src
  3. 1 1
      src/emqx_logger_jsonfmt.erl

+ 1 - 1
src/emqx.app.src

@@ -1,7 +1,7 @@
 {application, emqx,
 {application, emqx,
  [{id, "emqx"},
  [{id, "emqx"},
   {description, "EMQ X"},
   {description, "EMQ X"},
-  {vsn, "4.3.0"}, % strict semver, bump manually!
+  {vsn, "4.3.1"}, % strict semver, bump manually!
   {modules, []},
   {modules, []},
   {registered, []},
   {registered, []},
   {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]},
   {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]},

+ 6 - 1
src/emqx.appup.src

@@ -1,9 +1,14 @@
 %% -*-: erlang -*-
 %% -*-: erlang -*-
 {VSN,
 {VSN,
- [
+ [ {"4.3.0",
+    [ {load_module, emqx_logger_jsonfmt, brutal_purge, soft_purge, []}
+    ]},
    {<<".*">>, []}
    {<<".*">>, []}
  ],
  ],
  [
  [
+   {"4.3.0",
+    [ {load_module, emqx_logger_jsonfmt, brutal_purge, soft_purge, []}
+    ]},
    {<<".*">>, []}
    {<<".*">>, []}
  ]
  ]
 }.
 }.

+ 1 - 1
src/emqx_logger_jsonfmt.erl

@@ -48,7 +48,7 @@
 -spec format(logger:log_event(), config()) -> iodata().
 -spec format(logger:log_event(), config()) -> iodata().
 format(#{level := Level, msg := Msg, meta := Meta}, Config0) when is_map(Config0) ->
 format(#{level := Level, msg := Msg, meta := Meta}, Config0) when is_map(Config0) ->
     Config = add_default_config(Config0),
     Config = add_default_config(Config0),
-    format(Msg, Meta#{level => Level}, Config).
+    [format(Msg, Meta#{level => Level}, Config) , "\n"].
 
 
 format(Msg, Meta, Config) ->
 format(Msg, Meta, Config) ->
     Data0 =
     Data0 =