diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-13 11:55:56 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-13 11:55:56 +0100 |
| commit | 170ab1dccdd137115de074f6d585949f9dfa31e8 (patch) | |
| tree | ec10a767b6eab4ecfc920861612aff1ee8bd938a | |
| parent | cad9206fa97c1c0364cd55a1c099818180148bc5 (diff) | |
| download | rabbitmq-server-git-170ab1dccdd137115de074f6d585949f9dfa31e8.tar.gz | |
queue_index doesn't need to reimplement recursive delete
| -rw-r--r-- | src/rabbit_queue_index.erl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 4a54fda894..f678433913 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -325,7 +325,7 @@ terminate(Terms, State) -> terminate_and_erase(State) -> State1 = terminate(false, [], State), - ok = delete_queue_directory(State1 #qistate.dir), + ok = rabbit_misc:recursive_delete([State1 #qistate.dir]), State1. write_published(Guid, SeqId, IsPersistent, State) when is_binary(Guid) -> @@ -468,7 +468,7 @@ prepare_msg_store_seed_funs(DurableQueues) -> end, {[], [], []}, Directories), lists:foreach(fun (DirName) -> Dir = filename:join(queues_dir(), DirName), - ok = delete_queue_directory(Dir) + ok = rabbit_misc:recursive_delete([Dir]) end, TransientDirs), {{undefined, {fun (ok) -> finished end, ok}}, {DurableRefs, {fun queue_index_walker/1, DurableQueueNames}}}. @@ -590,13 +590,6 @@ queue_name_to_dir_name(Name = #resource { kind = queue }) -> queues_dir() -> filename:join(rabbit_mnesia:dir(), "queues"). -delete_queue_directory(Dir) -> - {ok, Entries} = file:list_dir(Dir), - ok = lists:foldl(fun (Entry, ok) -> - file:delete(filename:join(Dir, Entry)) - end, ok, Entries), - ok = file:del_dir(Dir). - get_segment_handle(Segment = #segment { handle = undefined, path = Path }) -> {ok, Hdl} = file_handle_cache:open(Path, [binary, raw, read, write, |