Implement verbose->loglevel + format log events

Author: dumbbell

deps/rabbit/src/rabbit_cli_cmd_list_exchanges.erl

@@ -36,7 +36,7 @@ list_exchanges(Args) ->
                    [VHost, InfoKeys]),
     case is_list(Ret) of
         true ->
-            rabbit_cli_output:notify(
+            rabbit_cli_io:notify(
               {info_table, #{keys => InfoKeys,
                              rows => Ret,
                              callbacks => #{
@@ -53,7 +53,7 @@ list_exchanges(Args) ->
                                end
                               }}});
         false ->
-            rabbit_cli_output:notify(Ret)
+            rabbit_cli_io:notify(Ret)
     end.
 
 get_nodename(#{node := Nodename}) ->

deps/rabbit/src/rabbit_cli_cmd_version.erl

@@ -14,4 +14,4 @@ cli() ->
 show_version(_) ->
     ok = application:load(rabbit),
     {ok, Version} = application:get_key(rabbit, vsn),
-    rabbit_cli_output:sync_notify(Version).
+    rabbit_cli_io:notify(Version).

deps/rabbit/src/rabbit_cli_global_options.erl

@@ -12,13 +12,13 @@ cli() ->
          action => store},
 
        #{name => vhost,
-         short => $v,
+         short => $p,
          long => "-vhost",
          type => binary,
          action => store},
 
        #{name => verbose,
-         short => $V,
+         short => $v,
          long => "-verbose",
          action => count}
       ]}.

deps/rabbit/src/rabbit_cli_output.erl renamed to deps/rabbit/src/rabbit_cli_io.erl

@@ -1,4 +1,4 @@
--module(rabbit_cli_output).
+-module(rabbit_cli_io).
 
 -export([setup/1,
          close/0,
@@ -13,7 +13,7 @@ setup(Args) ->
         {ok, Pid} ->
             ok = gen_event:add_sup_handler(
                    Pid,
-                   rabbit_cli_output_console,
+                   rabbit_cli_io_console,
                    Args),
             ok = logger:add_handler(
                    ?EVENT_MGR_REF, ?MODULE, #{}),
@@ -23,7 +23,7 @@ setup(Args) ->
     end.
 
 close() ->
-    gen_event:stop(rabbit_cli_output).
+    gen_event:stop(?EVENT_MGR_REF).
 
 notify(Event) ->
     gen_event:notify(?EVENT_MGR_REF, Event).

deps/rabbit/src/rabbit_cli_output_console.erl renamed to deps/rabbit/src/rabbit_cli_io_console.erl

@@ -1,4 +1,4 @@
--module(rabbit_cli_output_console).
+-module(rabbit_cli_io_console).
 -behaviour(gen_event).
 
 -include_lib("stdout_formatter/include/stdout_formatter.hrl").
@@ -29,6 +29,11 @@ init(_) ->
 handle_call(_Request, State) ->
     {ok, ok, State}.
 
+handle_event(
+  {log_event, LogEvent, #{formatter := {FModule, FConfig}}},
+  State) ->
+    io:put_chars(FModule:format(LogEvent, FConfig)),
+    {ok, State};
 handle_event(
   {info_table, #{keys := Keys, rows := Rows0, callbacks := CBs}},
   State)

deps/rabbit/src/rabbit_cli_main.erl

@@ -11,9 +11,8 @@ run(_ProgName, RawArgs) ->
     Ret = argparse:parse(RawArgs, CommandMap),
 
     %% 2. Output setup.
-    rabbit_cli_output:setup(Ret),
-    logger:set_primary_config(level, debug),
-    %logger:i(),
+    rabbit_cli_io:setup(Ret),
+    set_log_level(Ret),
     logger:debug("argparse:parse/2 -> ~p~n", [Ret]),
 
     %% 3. Command execution.
@@ -29,7 +28,7 @@ run(_ProgName, RawArgs) ->
 
 
     %% 4. Close output and return exit status.
-    rabbit_cli_output:close(),
+    rabbit_cli_io:close(),
     ok.
 
 discover_commands() ->
@@ -39,6 +38,16 @@ discover_commands() ->
      rabbit_cli_cmd_version
     ].
 
+set_log_level(#{verbose := Verbose}) ->
+    if
+        Verbose >= 2 -> logger:set_primary_config(level, debug);
+        true         -> logger:set_primary_config(level, info)
+    end;
+set_log_level(ArgMap) when is_map(ArgMap) ->
+    logger:set_primary_config(level, notice);
+set_log_level({ArgMap, _}) ->
+    set_log_level(ArgMap).
+
 %% -------------------------------------------------------------------
 %% Copied from `cli` module (argparse 1.1.0).
 %% -------------------------------------------------------------------