Try to switch to using a report_cb

src/lager_logger_formatter.erl

@@ -2,95 +2,87 @@
 
 %% convert logger formatter calls into lager formatter ones
 
--export([format/2]).%, check_config/1]).
+-export([report_cb/1, format/2]).%, check_config/1]).
 
-format(#{level := Level, msg := {report, #{label := {gen_server, terminate}, name := Name, reason := Reason}}, meta := Metadata}, Config) ->
+report_cb(#{msg := {report, #{label := {gen_server, terminate}, name := Name, reason := Reason}}}) ->
     {_Md, Formatted} = error_logger_lager_h:format_reason_md(Reason),
-    Msg = lager_format:format("gen_server ~w terminated with reason: ~s", [Name, Formatted], maps:get(max_size, Config, 1024)),
-    do_format(Level, Msg, Metadata, Config);
-format(#{level := Level, msg := {report, #{label := {gen_fsm, terminate}, name := Name, state_name := StateName, reason := Reason}}, meta := Metadata}, Config) ->
+    {"gen_server ~w terminated with reason: ~s", [Name, Formatted]};
+report_cb(#{msg := {report, #{label := {gen_fsm, terminate}, name := Name, state_name := StateName, reason := Reason}}}) ->
     {_Md, Formatted} = error_logger_lager_h:format_reason_md(Reason),
-    Msg = lager_format:format("gen_fsm ~w in state ~w terminated with reason: ~s", [Name, StateName, Formatted], maps:get(max_size, Config, 1024)),
-    do_format(Level, Msg, Metadata, Config);
-format(#{level := Level, msg := {report, #{label := {gen_event, terminate}, name := Name, handler := Handler, reason := Reason}}, meta := Metadata}, Config) ->
+    {"gen_fsm ~w in state ~w terminated with reason: ~s", [Name, StateName, Formatted]};
+report_cb(#{msg := {report, #{label := {gen_event, terminate}, name := Name, handler := Handler, reason := Reason}}}) ->
     {_Md, Formatted} = error_logger_lager_h:format_reason_md(Reason),
-    Msg = lager_format:format("gen_event ~w installed in ~w terminated with reason: ~s", [Handler, Name, Formatted], maps:get(max_size, Config, 1024)),
-    do_format(Level, Msg, Metadata, Config);
-format(#{level := Level, msg := {report, #{label := {gen_statem, terminate}, name := Name, reason := Reason}}, meta := Metadata}, Config) ->
+    {"gen_event ~w installed in ~w terminated with reason: ~s", [Handler, Name, Formatted]};
+report_cb(#{msg := {report, #{label := {gen_statem, terminate}, name := Name, reason := Reason}}}) ->
     {_Md, Formatted} = error_logger_lager_h:format_reason_md(Reason),
     %% XXX I can't find the FSM statename in the error report, maybe it should be added
-    Msg = lager_format:format("gen_statem ~w terminated with reason: ~s", [Name, Formatted], maps:get(max_size, Config, 1024)),
-    do_format(Level, Msg, Metadata, Config);
-format(#{level := Level, msg := {report, #{label := {Behaviour, no_handle_info}, mod := Mod, msg := Msg}}, meta := Metadata}, Config) ->
-    Msg = lager_format:format("undefined handle_info for ~p in ~s ~p", [Msg, Behaviour, Mod], maps:get(max_size, Config, 1024)),
-    do_format(Level, Msg, Metadata, Config);
-format(#{level := Level, msg := {report, #{label := {supervisor, progress}, report := Report}}, meta := Metadata}, Config) ->
+    {"gen_statem ~w terminated with reason: ~s", [Name, Formatted]};
+report_cb(#{msg := {report, #{label := {Behaviour, no_handle_info}, mod := Mod, msg := Msg}}}) ->
+    {"undefined handle_info for ~p in ~s ~p", [Msg, Behaviour, Mod]};
+report_cb(#{msg := {report, #{label := {supervisor, progress}, report := Report}}}) ->
     case application:get_env(lager, suppress_supervisor_start_stop, false) of
         true ->
-            "";
+            {"", []};
         false ->
             {supervisor, Name} = lists:keyfind(supervisor, 1, Report),
             {started, Started} = lists:keyfind(started, 1, Report),
-            Msg = case lists:keyfind(id, 1, Started) of
-                      false ->
-                          %% supervisor itself starting
-                          {mfa, {Module, Function, Args}} = lists:keyfind(mfa, 1, Started),
-                          {pid, Pid} = lists:keyfind(pid, 1, Started),
-                          lager_format:format("Supervisor ~w started as ~p at pid ~w", [Name, error_logger_lager_h:format_mfa({Module, Function, Args}), Pid], maps:get(max_size, Config, 1024));
-                      {id, ChildID} ->
-                          case lists:keyfind(pid, 1, Started) of
-                              {pid, Pid} ->
-                                  lager_format:format("Supervisor ~w started child ~p at pid ~w", [Name, ChildID, Pid], maps:get(max_size, Config, 1024));
-                              false ->
-                                  %% children is a list of pids for some reason? and we only get the count
-                                  {nb_children, ChildCount} = lists:keyfind(nb_children, 1, Started),
-                                  lager_format:format("Supervisor ~w started ~b children ~p", [Name, ChildCount, ChildID], maps:get(max_size, Config, 1024))
-                          end
-                  end,
-            do_format(Level, Msg, Metadata, Config)
+            case lists:keyfind(id, 1, Started) of
+                false ->
+                    %% supervisor itself starting
+                    {mfa, {Module, Function, Args}} = lists:keyfind(mfa, 1, Started),
+                    {pid, Pid} = lists:keyfind(pid, 1, Started),
+                    {"Supervisor ~w started as ~p at pid ~w", [Name, error_logger_lager_h:format_mfa({Module, Function, Args}), Pid]};
+                {id, ChildID} ->
+                    case lists:keyfind(pid, 1, Started) of
+                        {pid, Pid} ->
+                            {"Supervisor ~w started child ~p at pid ~w", [Name, ChildID, Pid]};
+                        false ->
+                            %% children is a list of pids for some reason? and we only get the count
+                            {nb_children, ChildCount} = lists:keyfind(nb_children, 1, Started),
+                            {"Supervisor ~w started ~b children ~p", [Name, ChildCount, ChildID]}
+                    end
+            end
     end;
-format(#{level := Level, msg := {report, #{label := {supervisor, _Error}, report := Report}}, meta := Metadata}, Config) ->
+report_cb(#{msg := {report, #{label := {supervisor, _Error}, report := Report}}}) ->
     {supervisor, Name} = lists:keyfind(supervisor, 1, Report),
     {reason, Reason} = lists:keyfind(reason, 1, Report),
     {_Md, Formatted} = error_logger_lager_h:format_reason_md(Reason),
     {errorContext, ErrorContext} = lists:keyfind(errorContext, 1, Report),
     {offender, Offender} = lists:keyfind(offender, 1, Report),
-    Msg = case lists:keyfind(mod, 1, Offender) of
-              {mod, _Mod} ->
-                  {pid, Pid} = lists:keyfind(pid, 1, Offender),
-                  %% this comes from supervisor_bridge
-                  lager_format:format("Supervisor ~w had ~p ~p with reason ~s", [Name, Pid, ErrorContext, Formatted], maps:get(max_size, Config, 1024));
-              false ->
-                  {id, ChildID} = lists:keyfind(id, 1, Offender),
-                  case lists:keyfind(pid, 1, Offender) of
-                      {pid, Pid} ->
-                          lager_format:format("Supervisor ~w had ~p ~p ~p with reason ~s", [Name, ChildID, Pid, ErrorContext, Formatted], maps:get(max_size, Config, 1024));
-                      false ->
-                          lager_format:format("Supervisor ~w had ~p ~p with reason ~s", [Name, ChildID, ErrorContext, Formatted], maps:get(max_size, Config, 1024))
-                  end
-          end,
-    do_format(Level, Msg, Metadata, Config);
-format(#{level := Level, msg := {report, #{label := {application_controller, progress}, report := Report}}, meta := Metadata}, Config) ->
+    case lists:keyfind(mod, 1, Offender) of
+        {mod, _Mod} ->
+            {pid, Pid} = lists:keyfind(pid, 1, Offender),
+            %% this comes from supervisor_bridge
+            {"Supervisor ~w had ~p ~p with reason ~s", [Name, Pid, ErrorContext, Formatted]};
+        false ->
+            {id, ChildID} = lists:keyfind(id, 1, Offender),
+            case lists:keyfind(pid, 1, Offender) of
+                {pid, Pid} ->
+                    {"Supervisor ~w had ~p ~p ~p with reason ~s", [Name, ChildID, Pid, ErrorContext, Formatted]};
+                false ->
+                    {"Supervisor ~w had ~p ~p with reason ~s", [Name, ChildID, ErrorContext, Formatted]}
+            end
+    end;
+report_cb(#{msg := {report, #{label := {application_controller, progress}, report := Report}}}) ->
     case application:get_env(lager, suppress_application_start_stop, false) of
-        true -> "";
+        true -> {"", []};
         false ->
             {application, Name} = lists:keyfind(application, 1, Report),
             {started_at, Node} = lists:keyfind(started_at, 1, Report),
-            Msg = lager_format:format("Application ~w started on node ~w", [Name, Node], maps:get(max_size, Config, 1024)),
-            do_format(Level, Msg, Metadata, Config)
+            {"Application ~w started on node ~w", [Name, Node]}
     end;
-format(#{level := Level, msg := {report, #{label := {application_controller, exit}, report := Report}}, meta := Metadata}, Config) ->
+report_cb(#{msg := {report, #{label := {application_controller, exit}, report := Report}}}) ->
     {exited, Reason} = lists:keyfind(exited, 1, Report),
     case application:get_env(lager, suppress_application_start_stop) of
         {ok, true} when Reason == stopped ->
-            ok;
+            {"", []};
         _ ->
             {application, Name} = lists:keyfind(application, 1, Report),
-            {_Md, Formatted} = format_reason_md(Reason),
-            Msg = lager_format:format("Application ~w exited with reason: ~s", [Name, Formatted], maps:get(max_size, Config, 1024)),
-            do_format(Level, Msg, Metadata, Config)
-    end;
+            {_Md, Formatted} = error_logger_lager_h:format_reason_md(Reason),
+            {"Application ~w exited with reason: ~s", [Name, Formatted]}
+    end.
 %% TODO handle proc_lib crash
+
 format(#{level := _Level, msg := {report, Report}, meta := _Metadata}, _Config) ->
     %do_format(Level, (maps:get(report_cb, Metadata))(Report), Metadata, Config);
     io_lib:format("REPORT ~p~n", [Report]);