diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-06-25 15:14:06 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-06-25 15:14:06 +0100 |
| commit | 4034ff6c17f88f5c3ca064a1e24198eb2e55f2a9 (patch) | |
| tree | f7cbe4b86e10784a6d5891b26bda9d3b1905e0d6 | |
| parent | 4bf843703d68e2ac9fc2dfd854889181769faee0 (diff) | |
| download | rabbitmq-server-4034ff6c17f88f5c3ca064a1e24198eb2e55f2a9.tar.gz | |
Small tidy-ups
| -rwxr-xr-x | scripts/rabbitmqctl | 1 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index 41e7a48b..032d10bf 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -29,7 +29,6 @@ exec ${ERL_DIR}erl \ ${RABBITMQ_CTL_ERL_ARGS} \ -boot "${CLEAN_BOOT_FILE}" \ -sasl errlog_type error \ - -sasl sasl_error_logger false \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ -s rabbit_control_main \ -nodename $RABBITMQ_NODENAME \ diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index b1a8721f..c7f94f58 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -304,8 +304,8 @@ action(forget_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> RemoveWhenOffline = proplists:get_bool(?OFFLINE_OPT, Opts), Inform("Removing node ~p from cluster", [ClusterNode]), case RemoveWhenOffline of - true -> become_and_apply(Node, rabbit_mnesia, forget_cluster_node, - [ClusterNode, true]); + true -> become(Node), + rabbit_mnesia:forget_cluster_node(ClusterNode, true); false -> rpc_call(Node, rabbit_mnesia, forget_cluster_node, [ClusterNode, false]) end; @@ -659,17 +659,16 @@ start_distribution() -> CtlNodeName = rabbit_misc:format("rabbitmqctl-~s", [os:getpid()]), {ok, _} = net_kernel:start([list_to_atom(CtlNodeName), shortnames]). -become_and_apply(BecomeNode, M, F, A) -> +become(BecomeNode) -> case net_adm:ping(BecomeNode) of pong -> exit({node_running, BecomeNode}); - pang -> io:format(" * Impersonating node ~s...", [BecomeNode]), + pang -> io:format(" * Impersonating node: ~s...", [BecomeNode]), error_logger:tty(false), ok = net_kernel:stop(), {ok, _} = net_kernel:start([BecomeNode, shortnames]), io:format(" done~n", []), Dir = mnesia:system_info(directory), - io:format(" * Mnesia dir: ~s~n", [Dir]), - apply(M, F, A) + io:format(" * Mnesia directory : ~s~n", [Dir]) end. %%---------------------------------------------------------------------------- |