summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-04-07 17:06:29 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-04-07 17:06:29 +0100
commit17da180f15f55c5ef2f35ad117cfc584bc7188da (patch)
tree0d48d6a08bd6bf58207d518ffa193482828b23f0
parent4d02f11fcc3c6a52a5e2b4afb07f8420c1793bfa (diff)
downloadrabbitmq-server-git-17da180f15f55c5ef2f35ad117cfc584bc7188da.tar.gz
Cosmetic.
-rw-r--r--src/rabbit_control.erl21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 1ec36e492b..6ab0711117 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -282,17 +282,18 @@ action(list_consumers, Node, _Args, Opts, Inform) ->
Other -> Other
end;
-action(set_env, Node, [VarStr, TermStr], _Opts, Inform) ->
- Inform("Setting control variable ~s for node ~p to ~s", [VarStr, Node, TermStr]),
- rpc_call(Node, application, set_env, [rabbit, parse_term(VarStr), parse_term(TermStr)]);
+action(set_env, Node, [Var, Term], _Opts, Inform) ->
+ Inform("Setting control variable ~s for node ~p to ~s", [Var, Node, Term]),
+ rpc_call(Node, application, set_env, [rabbit, parse(Var), parse(Term)]);
-action(get_env, Node, [VarStr], _Opts, Inform) ->
- Inform("Getting control variable ~s for node ~p", [VarStr, Node]),
- io:format("~p~n", [rpc_call(Node, application, get_env, [rabbit, parse_term(VarStr)])]);
+action(get_env, Node, [Var], _Opts, Inform) ->
+ Inform("Getting control variable ~s for node ~p", [Var, Node]),
+ Val = rpc_call(Node, application, get_env, [rabbit, parse(Var)]),
+ io:format("~p~n", [Val]);
-action(unset_env, Node, [VarStr], _Opts, Inform) ->
- Inform("Clearing control variable ~s for node ~p", [VarStr, Node]),
- rpc_call(Node, application, unset_env, [rabbit, parse_term(VarStr)]);
+action(unset_env, Node, [Var], _Opts, Inform) ->
+ Inform("Clearing control variable ~s for node ~p", [Var, Node]),
+ rpc_call(Node, application, unset_env, [rabbit, parse(Var)]);
action(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) ->
VHost = proplists:get_value(?VHOST_OPT, Opts),
@@ -337,7 +338,7 @@ default_if_empty(List, Default) when is_list(List) ->
true -> [list_to_atom(X) || X <- List]
end.
-parse_term(Str) ->
+parse(Str) ->
{ok, Tokens, _} = erl_scan:string(Str ++ "."),
{ok, Term} = erl_parse:parse_term(Tokens),
Term.