unbreak durable queue dir cleanup

all_queue_directory_names returns just names, not paths

Also, gain some efficiency by performing just one invocation of
rabbit_file:recursive_delete/1, with all dirs.

And some cosmetics.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index b5a316f0cf..919b7376a7 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -358,9 +358,10 @@ start(DurableQueueNames) ->
 
     %% Any queue directory we've not been asked to recover is considered garbage
     QueuesDir = queues_dir(),
-    [rabbit_file:recursive_delete([QueueDir]) ||
-        QueueDir <- all_queue_directory_names(QueuesDir),
-        not sets:is_element(filename:basename(QueueDir), DurableDirectories)],
+    rabbit_file:recursive_delete(
+      [filename:join(QueuesDir, DirName) ||
+          DirName <- all_queue_directory_names(QueuesDir),
+          not sets:is_element(DirName, DurableDirectories)]),
 
     rabbit_recovery_terms:clear(),
 
@@ -373,9 +374,8 @@ stop() -> rabbit_recovery_terms:stop().
 
 all_queue_directory_names(Dir) ->
     case rabbit_file:list_dir(Dir) of
-        {ok, Entries}   -> [ Entry || Entry <- Entries,
-                                      rabbit_file:is_dir(
-                                        filename:join(Dir, Entry)) ];
+        {ok, Entries}   -> [E || E <- Entries,
+                                 rabbit_file:is_dir(filename:join(Dir, E))];
         {error, enoent} -> []
     end.