summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-06-11 12:24:09 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-06-11 12:24:09 +0200
commit39360235188fca8727051403924226e0efda9f8b (patch)
tree6b3ba204e7d3eeb2b09a2bad265ccb8d72634a22
parent44f35f3693720f9e072b595d5aa5bb692dae1cd4 (diff)
downloadrabbitmq-server-git-39360235188fca8727051403924226e0efda9f8b.tar.gz
action/5 calls action/6 with default timeout for unknown commands
This restore backward compatibility and unbreak the test suite. References #62.
-rw-r--r--src/rabbit_control_main.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 5a0ce17441..822608f50e 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -478,7 +478,12 @@ action(eval, Node, [Expr], _Opts, _Inform) ->
end;
{error, E, _} ->
{error_string, format_parse_error(E)}
- end.
+ end;
+
+action(Command, Node, Args, Opts, Inform) ->
+ %% For backward compatibility, run commands accepting a timeout with
+ %% the default timeout.
+ action(Command, Node, Args, Opts, Inform, ?RPC_TIMEOUT).
action(list_users, Node, [], _Opts, Inform, Timeout) ->
Inform("Listing users", []),