file_name -> filename

The latter is used in more places and also by OTP.  In the process fix
a bug - rabbit_upgrade was referencing
rabbit_node_monitor:running_nodes_filename/0, which was in fact named
running_nodes_file_name.
That function was also missing a spec.
And it was in the "wrong" place w.r.t. the function order in the module ;)

4 files changed, 26 insertions, 26 deletions

diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index e1a68fc7..40600063 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -1173,8 +1173,8 @@ is_virgin_node() ->
         {error, enoent} -> true;
         {ok, []}        -> true;
         {ok, [File]}    -> (dir() ++ "/" ++ File) =:=
-                               [rabbit_node_monitor:cluster_status_file_name(),
-                                rabbit_node_monitor:running_nodes_file_name()];
+                               [rabbit_node_monitor:cluster_status_filename(),
+                                rabbit_node_monitor:running_nodes_filename()];
         {ok, _}         -> false
     end.
 
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index d69dad1f..c2e55022 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1394,7 +1394,7 @@ filenum_to_name(File) -> integer_to_list(File) ++ ?FILE_EXTENSION.
 
 filename_to_num(FileName) -> list_to_integer(filename:rootname(FileName)).
 
-list_sorted_file_names(Dir, Ext) ->
+list_sorted_filenames(Dir, Ext) ->
     lists:sort(fun (A, B) -> filename_to_num(A) < filename_to_num(B) end,
                filelib:wildcard("*" ++ Ext, Dir)).
 
@@ -1531,8 +1531,8 @@ count_msg_refs(Gen, Seed, State) ->
     end.
 
 recover_crashed_compactions(Dir) ->
-    FileNames =    list_sorted_file_names(Dir, ?FILE_EXTENSION),
-    TmpFileNames = list_sorted_file_names(Dir, ?FILE_EXTENSION_TMP),
+    FileNames =    list_sorted_filenames(Dir, ?FILE_EXTENSION),
+    TmpFileNames = list_sorted_filenames(Dir, ?FILE_EXTENSION_TMP),
     lists:foreach(
       fun (TmpFileName) ->
               NonTmpRelatedFileName =
@@ -1609,7 +1609,7 @@ build_index(false, {MsgRefDeltaGen, MsgRefDeltaGenInit},
     ok = count_msg_refs(MsgRefDeltaGen, MsgRefDeltaGenInit, State),
     {ok, Pid} = gatherer:start_link(),
     case [filename_to_num(FileName) ||
-             FileName <- list_sorted_file_names(Dir, ?FILE_EXTENSION)] of
+             FileName <- list_sorted_filenames(Dir, ?FILE_EXTENSION)] of
         []     -> build_index(Pid, undefined, [State #msstate.current_file],
                               State);
         Files  -> {Offset, State1} = build_index(Pid, undefined, Files, State),
@@ -2023,7 +2023,7 @@ transform_dir(BaseDir, Store, TransformFun) ->
     CopyFile = fun (Src, Dst) -> {ok, _Bytes} = file:copy(Src, Dst), ok end,
     case filelib:is_dir(TmpDir) of
         true  -> throw({error, transform_failed_previously});
-        false -> FileList = list_sorted_file_names(Dir, ?FILE_EXTENSION),
+        false -> FileList = list_sorted_filenames(Dir, ?FILE_EXTENSION),
                  foreach_file(Dir, TmpDir, TransformFile,     FileList),
                  foreach_file(Dir,         fun file:delete/1, FileList),
                  foreach_file(TmpDir, Dir, CopyFile,          FileList),
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index 23b894dc..64c801f2 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -18,8 +18,8 @@
 
 -behaviour(gen_server).
 
--export([cluster_status_file_name/0,
-         running_nodes_file_name/0,
+-export([running_nodes_filename/0,
+         cluster_status_filename/0,
          prepare_cluster_status_files/0,
          write_cluster_status/1,
          read_cluster_status/0,
@@ -49,10 +49,10 @@
 
 -ifdef(use_specs).
 
--spec(cluster_status_file_name/0 :: () -> string()).
+-spec(running_nodes_filename/0 :: () -> string()).
+-spec(cluster_status_filename/0 :: () -> string()).
 -spec(prepare_cluster_status_files/0 :: () -> 'ok').
--spec(write_cluster_status/1 :: (rabbit_mnesia:cluster_status())
-                                -> 'ok').
+-spec(write_cluster_status/1 :: (rabbit_mnesia:cluster_status()) -> 'ok').
 -spec(read_cluster_status/0 :: () -> rabbit_mnesia:cluster_status()).
 -spec(update_cluster_status/0 :: () -> 'ok').
 -spec(reset_cluster_status/0 :: () -> 'ok').
@@ -79,22 +79,22 @@
 %% various situations. Obviously when mnesia is offline the information we have
 %% will be outdated, but it can't be otherwise.
 
-cluster_status_file_name() ->
-    rabbit_mnesia:dir() ++ "/cluster_nodes.config".
-
-running_nodes_file_name() ->
+running_nodes_filename() ->
     filename:join(rabbit_mnesia:dir(), "nodes_running_at_shutdown").
 
+cluster_status_filename() ->
+    rabbit_mnesia:dir() ++ "/cluster_nodes.config".
+
 prepare_cluster_status_files() ->
     rabbit_mnesia:ensure_mnesia_dir(),
     CorruptFiles = fun () -> throw({error, corrupt_cluster_status_files}) end,
-    RunningNodes1 = case try_read_file(running_nodes_file_name()) of
+    RunningNodes1 = case try_read_file(running_nodes_filename()) of
                         {ok, [Nodes]} when is_list(Nodes) -> Nodes;
                         {ok, _      }                     -> CorruptFiles();
                         {error, enoent}                   -> []
                     end,
     {AllNodes1, WantDiscNode} =
-        case try_read_file(cluster_status_file_name()) of
+        case try_read_file(cluster_status_filename()) of
             {ok, [{AllNodes, DiscNodes0}]} ->
                 {AllNodes, lists:member(node(), DiscNodes0)};
             {ok, [AllNodes0]} when is_list(AllNodes0) ->
@@ -118,10 +118,10 @@ prepare_cluster_status_files() ->
     ok = write_cluster_status({AllNodes2, DiscNodes, RunningNodes2}).
 
 write_cluster_status({All, Disc, Running}) ->
-    ClusterStatusFN = cluster_status_file_name(),
+    ClusterStatusFN = cluster_status_filename(),
     Res = case rabbit_file:write_term_file(ClusterStatusFN, [{All, Disc}]) of
               ok ->
-                  RunningNodesFN = running_nodes_file_name(),
+                  RunningNodesFN = running_nodes_filename(),
                   {RunningNodesFN,
                    rabbit_file:write_term_file(RunningNodesFN, [Running])};
               E1 = {error, _} ->
@@ -140,8 +140,8 @@ try_read_file(FileName) ->
     end.
 
 read_cluster_status() ->
-    case {try_read_file(cluster_status_file_name()),
-          try_read_file(running_nodes_file_name())} of
+    case {try_read_file(cluster_status_filename()),
+          try_read_file(running_nodes_filename())} of
         {{ok, [{All, Disc}]}, {ok, [Running]}} when is_list(Running) ->
             {All, Disc, Running};
         {_, _} ->
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 3ef769c7..6d6c648a 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -400,19 +400,19 @@ blank_state_dir(Dir) ->
                on_sync             = fun (_) -> ok end,
                unsynced_msg_ids    = gb_sets:new() }.
 
-clean_file_name(Dir) -> filename:join(Dir, ?CLEAN_FILENAME).
+clean_filename(Dir) -> filename:join(Dir, ?CLEAN_FILENAME).
 
 detect_clean_shutdown(Dir) ->
-    case rabbit_file:delete(clean_file_name(Dir)) of
+    case rabbit_file:delete(clean_filename(Dir)) of
         ok              -> true;
         {error, enoent} -> false
     end.
 
 read_shutdown_terms(Dir) ->
-    rabbit_file:read_term_file(clean_file_name(Dir)).
+    rabbit_file:read_term_file(clean_filename(Dir)).
 
 store_clean_shutdown(Terms, Dir) ->
-    CleanFileName = clean_file_name(Dir),
+    CleanFileName = clean_filename(Dir),
     ok = rabbit_file:ensure_dir(CleanFileName),
     rabbit_file:write_term_file(CleanFileName, Terms).