diff options
| author | Tim Watson <watson.timothy@gmail.com> | 2014-01-10 14:57:25 +0000 |
|---|---|---|
| committer | Tim Watson <watson.timothy@gmail.com> | 2014-01-10 14:57:25 +0000 |
| commit | d28bd218ef421090d0a91cf778af0c0fe1764bfa (patch) | |
| tree | 34ffede1d1417c3876c5a3d251004c1cfdba75eb /src | |
| parent | 7ddbff08e14cbc66529a3005df0268b9fcb81b68 (diff) | |
| download | rabbitmq-server-git-d28bd218ef421090d0a91cf778af0c0fe1764bfa.tar.gz | |
Stop using the full path to the queue directory as the recovery key
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_queue_index.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_recovery_terms.erl | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index 4a809f43c9..083e03da8d 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -370,20 +370,19 @@ recover(DurableQueues) -> {DirName, Queue} end || Queue <- DurableQueues ]), - QueuesDir = queues_dir(), {DurableQueueNames, DurableTerms} = dict:fold( fun (QueueDirName, QueueName, {DurableAcc, TermsAcc}) -> - QueueDirPath = filename:join(QueuesDir, QueueDirName), TermsAcc1 = - case rabbit_recovery_terms:read(QueueDirPath) of + case rabbit_recovery_terms:read(QueueDirName) of {error, _} -> TermsAcc; - {ok, Terms} -> [{QueueDirPath, Terms} | TermsAcc] + {ok, Terms} -> [{QueueDirName, Terms} | TermsAcc] end, {[QueueName | DurableAcc], TermsAcc1} end, {[], []}, DurableDict), %% Any queue directory we've not been asked to recover is considered garbage + QueuesDir = queues_dir(), lists:map( fun(QueueDir) -> case dict:is_key(filename:basename(QueueDir), diff --git a/src/rabbit_recovery_terms.erl b/src/rabbit_recovery_terms.erl index 7a558b0721..b5426dd8d3 100644 --- a/src/rabbit_recovery_terms.erl +++ b/src/rabbit_recovery_terms.erl @@ -100,7 +100,7 @@ read(QueueDir) -> end. lookup(QueueName, Terms) -> - lists:keyfind(to_dirname(QueueName), 1, Terms). + lists:keyfind(QueueName, 1, Terms). clear() -> dets:delete_all_objects(?MODULE), @@ -142,6 +142,3 @@ to_key(QueueDir) -> dets_filename() -> filename:join(rabbit_mnesia:dir(), "recovery.dets"). -to_dirname(FileName) -> - filename:join([rabbit_mnesia:dir(), "queues", FileName]). - |