summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_queue_index.erl2
-rw-r--r--src/rabbit_recovery_terms.erl7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index 3da56c9387..8db6717d76 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -343,7 +343,7 @@ bounds(State = #qistate { segments = Segments }) ->
{LowSeqId, NextSeqId, State}.
recover(DurableQueueNames) ->
- rabbit_recovery_terms:recover(),
+ ok = rabbit_recovery_terms:recover(),
{DurableTerms, DurableDirectories} =
lists:foldl(
fun(QName, {RecoveryTerms, ValidDirectories}) ->
diff --git a/src/rabbit_recovery_terms.erl b/src/rabbit_recovery_terms.erl
index dda5794240..6e2a4a3d53 100644
--- a/src/rabbit_recovery_terms.erl
+++ b/src/rabbit_recovery_terms.erl
@@ -45,11 +45,8 @@
-define(SERVER, ?MODULE).
recover() ->
- case supervisor:start_child(rabbit_sup,
- {?SERVER, {?MODULE, start_link, []},
- permanent, 16#ffffffff, worker,
- [?SERVER]}) of
- {ok, _} -> ok;
+ case rabbit_sup:start_child(?MODULE) of
+ ok -> ok;
{error, {already_started, _}} -> ok;
{error, _}=Err -> Err
end.