diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-11-28 16:13:19 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-11-28 16:13:19 +0000 |
| commit | 96514d234b7cf974be41eddfd8e1f25400b8dfe4 (patch) | |
| tree | 29651c99c60f6d3423b3d4b1cfb4befa696a2dc1 | |
| parent | cf05604306a8e36055746524cb2ece48e0434bb0 (diff) | |
| download | rabbitmq-server-96514d234b7cf974be41eddfd8e1f25400b8dfe4.tar.gz | |
Rename things
| -rw-r--r-- | src/rabbit_control_main.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_mnesia_rename.erl (renamed from src/rabbit_mnesia_offline.erl) | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 21c4e4c3..c00c694c 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -40,7 +40,7 @@ change_cluster_node_type, update_cluster_nodes, {forget_cluster_node, [?OFFLINE_DEF]}, - rename_current_node, + rename_node, force_boot, cluster_status, {sync_queue, [?VHOST_DEF]}, @@ -105,7 +105,7 @@ -define(COMMANDS_NOT_REQUIRING_APP, [stop, stop_app, start_app, wait, reset, force_reset, rotate_logs, join_cluster, change_cluster_node_type, update_cluster_nodes, - forget_cluster_node, rename_current_node, cluster_status, status, + forget_cluster_node, rename_node, cluster_status, status, environment, eval, force_boot]). %%---------------------------------------------------------------------------- @@ -235,13 +235,12 @@ action(forget_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> [ClusterNode, false]) end; -action(rename_current_node, _Node, [FromNodeS, ToNodeS | OthersS], - _Opts, Inform) -> +action(rename_node, _Node, [FromNodeS, ToNodeS | OthersS], _Opts, Inform) -> Others = [list_to_atom(N) || N <- OthersS], FromNode = list_to_atom(FromNodeS), ToNode = list_to_atom(ToNodeS), Inform("Renaming local cluster node ~s to ~s", [FromNode, ToNode]), - rabbit_mnesia_offline:rename_local_node(FromNode, ToNode, Others); + rabbit_mnesia_rename:rename(FromNode, ToNode, Others); action(force_boot, Node, [], _Opts, Inform) -> Inform("Forcing boot for Mnesia dir ~s", [mnesia:system_info(directory)]), diff --git a/src/rabbit_mnesia_offline.erl b/src/rabbit_mnesia_rename.erl index 7c610f17..ef3854de 100644 --- a/src/rabbit_mnesia_offline.erl +++ b/src/rabbit_mnesia_rename.erl @@ -14,10 +14,10 @@ %% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved. %% --module(rabbit_mnesia_offline). +-module(rabbit_mnesia_rename). -include("rabbit.hrl"). --export([rename_local_node/3]). +-export([rename/3]). -export([maybe_complete_rename/1]). -define(CONVERT_TABLES, [schema, rabbit_durable_queue]). @@ -26,14 +26,14 @@ -ifdef(use_specs). --spec(rename_local_node/3 :: (node(), node(), [node()]) -> 'ok'). +-spec(rename/3 :: (node(), node(), [node()]) -> 'ok'). -spec(maybe_complete_rename/1 :: ([node()]) -> 'ok'). -endif. %%---------------------------------------------------------------------------- -rename_local_node(FromNode, ToNode, Others) -> +rename(FromNode, ToNode, Others) -> NodeMap = dict:from_list(split_others([FromNode, ToNode | Others])), try rabbit_control_main:become(FromNode), |