Naming and cosmetics

5 files changed, 15 insertions, 16 deletions

diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 71a7d9f15a..b0beb975e8 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -718,7 +718,7 @@ init([Server, BaseDir, ClientRefs, StartupFunState]) ->
 
     Dir = filename:join(BaseDir, atom_to_list(Server)),
 
-    {ok, IndexModule} = application:get_env(rabbit,msg_store_index_module),
+    {ok, IndexModule} = application:get_env(rabbit, msg_store_index_module),
     rabbit_log:info("~w: using ~p to provide index~n", [Server, IndexModule]),
 
     AttemptFileSummaryRecovery =
@@ -758,7 +758,7 @@ init([Server, BaseDir, ClientRefs, StartupFunState]) ->
     DyingIndex      = ets:new(rabbit_msg_store_dying_client_index,
                               [set, public, {keypos, #dying_client.client_ref}]),
 
-    {ok, FileSizeLimit} = application:get_env(rabbit,msg_store_file_size_limit),
+    {ok, FileSizeLimit} = application:get_env(rabbit, msg_store_file_size_limit),
 
     {ok, GCPid} = rabbit_msg_store_gc:start_link(
                     #gc_state { dir              = Dir,
@@ -995,13 +995,12 @@ terminate(_Reason, State = #msstate { index_state         = IndexState,
                               State2
              end,
     State3 = close_all_handles(State1),
-    %% Let file summary saving fail.
     case store_file_summary(FileSummaryEts, Dir) of
         ok           -> ok;
         {error, FSErr} ->
             rabbit_log:error("Unable to store file summary"
                              " for vhost message store for directory ~p~n"
-                             " Error: ~p~n",
+                             "Error: ~p~n",
                              [Dir, FSErr])
     end,
     [true = ets:delete(T) || T <- [FileSummaryEts, FileHandlesEts,
@@ -1012,7 +1011,7 @@ terminate(_Reason, State = #msstate { index_state         = IndexState,
         ok           -> ok;
         {error, RTErr} ->
             rabbit_log:error("Unable to save message store recovery terms"
-                             "for directory ~p~n Error: ~p~n",
+                             "for directory ~p~nError: ~p~n",
                              [Dir, RTErr])
     end,
     State3 #msstate { index_state         = undefined,
diff --git a/src/rabbit_msg_store_ets_index.erl b/src/rabbit_msg_store_ets_index.erl
index 39c0cc96bd..0e8b7174e2 100644
--- a/src/rabbit_msg_store_ets_index.erl
+++ b/src/rabbit_msg_store_ets_index.erl
@@ -79,7 +79,7 @@ terminate(#state { table = MsgLocations, dir = Dir }) ->
         ok           -> ok;
         {error, Err} ->
             rabbit_log:error("Unable to save message store index"
-                             " for directory ~p~n Error: ~p~n",
+                             " for directory ~p.~nError: ~p~n",
                              [Dir, Err])
     end,
     ets:delete(MsgLocations).
diff --git a/src/rabbit_msg_store_vhost_sup.erl b/src/rabbit_msg_store_vhost_sup.erl
index d60004caef..a5be431093 100644
--- a/src/rabbit_msg_store_vhost_sup.erl
+++ b/src/rabbit_msg_store_vhost_sup.erl
@@ -50,19 +50,19 @@ maybe_start_vhost(Server, VHost) ->
     VHostName.
 
 vhost_store_name(Name, VHost) ->
-    VhostEncoded = rabbit_vhost:dir(VHost),
+    Base64EncodedName = rabbit_vhost:dir(VHost),
     binary_to_atom(<<(atom_to_binary(Name, utf8))/binary, "_",
-                     VhostEncoded/binary>>,
+                     Base64EncodedName/binary>>,
                    utf8).
 
 vhost_store_dir(VHost) ->
     Dir = rabbit_mnesia:dir(),
-    VhostEncoded = rabbit_vhost:dir(VHost),
-    binary_to_list(filename:join([Dir, VhostEncoded])).
+    Base64EncodedName = rabbit_vhost:dir(VHost),
+    binary_to_list(filename:join([Dir, Base64EncodedName])).
 
 successfully_recovered_state(Name, VHost) ->
     VHostName = vhost_store_name(Name, VHost),
     rabbit_msg_store:successfully_recovered_state(VHostName).
 
 % force_recovery
-% transform_dir
\ No newline at end of file
+% transform_dir
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 3827080a2f..d19694403c 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -25,8 +25,8 @@
 -export([add_queue_ttl/0, avoid_zeroes/0, store_msg_size/0, store_msg/0]).
 -export([scan_queue_segments/3]).
 
-%% Migration to per-vhost message store
--export([move_to_vhost_store/1]).
+%% Migrates from global to per-vhost message stores
+-export([move_to_per_vhost_stores/1]).
 
 -define(CLEAN_FILENAME, "clean.dot").
 
@@ -516,7 +516,7 @@ blank_state_dir(Dir) ->
                          fun (_) -> ok end).
 
 queue_dir(#resource{ virtual_host = VHost } = QueueName) ->
-    %% Queue directory is rabbit_mnesia_dir/:vhost/queues/:queue_id
+    %% Queue directory is {node_database_dir}/{vhost}/queues/{queue}
     filename:join([queues_base_dir(), rabbit_vhost:dir(VHost),
                    "queues", queue_name_to_dir_name(QueueName)]).
 
@@ -1404,7 +1404,7 @@ drive_transform_fun(Fun, Hdl, Contents) ->
                                drive_transform_fun(Fun, Hdl, Contents1)
     end.
 
-move_to_vhost_store(#resource{} = QueueName) ->
+move_to_per_vhost_stores(#resource{} = QueueName) ->
     OldQueueDir = filename:join([queues_base_dir(), "queues",
                                  queue_name_to_dir_name(QueueName)]),
     NewQueueDir = queue_dir(QueueName),
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 95604d08f4..41ee6cde4c 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -2746,7 +2746,7 @@ migrate_queue(Queue, OldStore, NewStoreSup) ->
     OldStoreClient = get_old_client(OldStore),
     NewStoreClient = get_new_store_client(Queue, NewStoreSup),
     #amqqueue{name = QueueName} = Queue,
-    rabbit_queue_index:move_to_vhost_store(QueueName),
+    rabbit_queue_index:move_to_per_vhost_stores(QueueName),
     %% WARNING: During scan_queue_segments queue index state is being recovered
     %% and terminated. This can cause side effects!
     rabbit_queue_index:scan_queue_segments(