2 files changed, 42 insertions, 2 deletions
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
index 51743822af..d60be180bc 100644
--- a/lib/kernel/src/logger.erl
+++ b/lib/kernel/src/logger.erl
@@ -41,6 +41,7 @@
          set_logger_config/1, set_logger_config/2,
          set_handler_config/2, set_handler_config/3,
          update_logger_config/1, update_handler_config/2,
+         update_formatter_config/2, update_formatter_config/3,
          get_logger_config/0, get_handler_config/1,
          add_handlers/1]).
 
@@ -92,7 +93,7 @@
 -type config() :: #{level => level(),
                     filter_default => log | stop,
                     filters => [{filter_id(),filter()}],
-                    formatter => {module(),term()},
+                    formatter => {module(),map()},
                     term() => term()}.
 -type timestamp() :: integer().
 
@@ -386,6 +387,21 @@ get_logger_config() ->
 get_handler_config(HandlerId) ->
     logger_config:get(?LOGGER_TABLE,HandlerId).
 
+-spec update_formatter_config(HandlerId,FormatterConfig) ->
+                                     ok | {error,term()} when
+      HandlerId :: config(),
+      FormatterConfig :: map().
+update_formatter_config(HandlerId,FormatterConfig) ->
+    logger_server:update_formatter_config(HandlerId,FormatterConfig).
+
+-spec update_formatter_config(HandlerId,Key,Value) ->
+                                     ok | {error,term()} when
+      HandlerId :: config(),
+      Key :: atom(),
+      Value :: term().
+update_formatter_config(HandlerId,Key,Value) ->
+    logger_server:update_formatter_config(HandlerId,#{Key=>Value}).
+
 -spec set_module_level(Module,Level) -> ok | {error,term()} when
       Module :: module(),
       Level :: level().
diff --git a/lib/kernel/src/logger_server.erl b/lib/kernel/src/logger_server.erl
index 67befef156..18a784c8c2 100644
--- a/lib/kernel/src/logger_server.erl
+++ b/lib/kernel/src/logger_server.erl
@@ -27,7 +27,8 @@
          add_filter/2, remove_filter/2,
          set_module_level/2, reset_module_level/1,
          cache_module_level/1,
-         set_config/2, set_config/3, update_config/2]).
+         set_config/2, set_config/3, update_config/2,
+         update_formatter_config/2]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -111,6 +112,13 @@ update_config(Owner, Config) ->
             Error
     end.
 
+update_formatter_config(HandlerId, FormatterConfig)
+  when is_map(FormatterConfig) ->
+    call({update_formatter_config,HandlerId,FormatterConfig});
+update_formatter_config(_HandlerId, FormatterConfig) ->
+    {error,{invalid_formatter_config,FormatterConfig}}.
+
+
 %%%===================================================================
 %%% gen_server callbacks
 %%%===================================================================
@@ -216,6 +224,22 @@ handle_call({set_config,HandlerId,Config}, From, #state{tid=Tid}=State) ->
         _ ->
             {reply,{error,{not_found,HandlerId}},State}
     end;
+handle_call({update_formatter_config,HandlerId,NewFConfig},_From,
+            #state{tid=Tid}=State) ->
+    Reply =
+        case logger_config:get(Tid,HandlerId) of
+            {ok,{_Mod,#{formatter:={FMod,OldFConfig}}=Config}} ->
+                try
+                    FConfig = maps:merge(OldFConfig,NewFConfig),
+                    check_formatter({FMod,FConfig}),
+                    do_set_config(Tid,HandlerId,
+                                  Config#{formatter=>{FMod,FConfig}})
+                catch throw:Reason -> {error,Reason}
+                end;
+            _ ->
+            {error,{not_found,HandlerId}}
+        end,
+    {reply,Reply,State};
 handle_call({set_module_level,Module,Level}, _From, #state{tid=Tid}=State) ->
     Reply = logger_config:set_module_level(Tid,Module,Level),
     {reply,Reply,State};