wip

Author: dumbbell

deps/rabbit/src/rabbit_cli.erl

@@ -50,27 +50,25 @@ get_rabbitmq_nodename_from_args(Args) ->
                       action => count,
                       help =>
                       "Be verbose; can be specified multiple times to "
-                      "increase "
-                      "verbosity"},
+                      "increase verbosity"},
                     #{name => node,
                       long => "-node",
                       short => $n,
                       type => string,
                       nargs => 1,
-                      help => "Name of the node to control"},
-                    #{name => rest,
-                      nargs => list,
-                      action => extend,
-                      required => false,
-                      default => []}]},
-    case argparse:parse(Args, Definition, #{}) of
-        {ok, #{node := Nodename, rest := Rest}, _, _} ->
+                      help => "Name of the node to control"}]},
+    ?LOG_ALERT("argparse 1: ~p", [Definition]),
+    case rabbit_cli_io:parse(Args, Definition) of
+        {ok, #{node := Nodename} = _ArgMap, _, _, Rest} ->
+            ?LOG_ALERT("argparse 1: ~p, ~p", [_ArgMap, Rest]),
             {ok, {Nodename, Rest}};
-        {ok, #{rest := Rest}, _, _} ->
+        {ok, #{rest := Rest} = _ArgMap, _, _} ->
+            ?LOG_ALERT("argparse 1: ~p", [_ArgMap]),
             {ok, Rest};
         {error, {_, #{name := node}, _, ErrorMsg}} ->
             {error, ErrorMsg};
-        {error, _} ->
+        {error, _} = _Error->
+            ?LOG_ALERT("argparse 1: ~p", [_Error]),
             {ok, Args}
     end.
 

deps/rabbit/src/rabbit_cli_commands.erl

@@ -17,7 +17,7 @@ commands() ->
          required => false,
          default => []}
       ],
-      commands =>
+      xcommands =>
       #{
        "list" =>
        #{
@@ -33,16 +33,19 @@ commands() ->
 
 run_command(Args, IO) ->
     Definition = commands(),
+    ?LOG_ALERT("argparse 2: ~p", [Definition]),
     case argparse:parse(Args, Definition, #{}) of
         {ok, ArgMap, _CmdPath, Command} ->
+            ?LOG_ALERT("argparse 2: ~p", [ArgMap]),
             %% TODO: Put both processes under the rabbit supervision tree.
             RunnerPid = command_runner(Command, ArgMap, IO),
             RunnerMRef = erlang:monitor(process, RunnerPid),
             receive
                 {'DOWN', RunnerMRef, _, _, Reason} ->
                     {ok, Reason}
             end;
-        {error, _Reason} = Error ->
+        {error, Reason} = Error ->
+            ?LOG_ALERT("Error: ~s", [argparse:format_error(Reason)]),
             Error
     end.
 

deps/rabbit/src/rabbit_cli_io.erl

@@ -4,6 +4,7 @@
 
 -include_lib("rabbit_common/include/resource.hrl").
 
+-export([parse/2]).
 -export([start_link/0,
          stop/1,
          start_record_stream/4,
@@ -18,6 +19,22 @@
 
 -record(?MODULE, {record_streams = #{}}).
 
+parse(Args, Definition) ->
+    parse(Args, Definition, []).
+
+parse(Args, Definition, Unknown) ->
+    case argparse:parse(Args, Definition, #{}) of
+        {ok, ArgMap, CmdPath, Command} ->
+            Unknown1 = lists:reverse(Unknown),
+            {ok, ArgMap, CmdPath, Command, Unknown1};
+        {error, {_CmdPath, undefined, Arg, <<>>}} ->
+            Args1 = Args -- [Arg],
+            Unknown1 = [Arg | Unknown],
+            parse(Args1, Definition, Unknown1);
+        {error, _} = Error ->
+            Error
+    end.
+
 start_link() ->
     gen_server:start_link(rabbit_cli_io, none, []).