summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mnesia.erl7
-rw-r--r--src/rabbit_peer_discovery.erl2
2 files changed, 1 insertions, 8 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 6781c1a720..b7db646dad 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -128,13 +128,6 @@ init_with_lock(Retries, Timeout, RunPeerDiscovery) ->
rabbit_peer_discovery:maybe_register()
after
rabbit_peer_discovery:unlock(Data)
- end;
- Data when is_binary(Data) or is_list(Data) ->
- try
- RunPeerDiscovery(),
- rabbit_peer_discovery:maybe_register()
- after
- rabbit_peer_discovery:unlock(Data)
end
end.
diff --git a/src/rabbit_peer_discovery.erl b/src/rabbit_peer_discovery.erl
index c2860f3b24..9c3f9f768d 100644
--- a/src/rabbit_peer_discovery.erl
+++ b/src/rabbit_peer_discovery.erl
@@ -250,7 +250,7 @@ unregister() ->
ok
end.
--spec lock() -> ok | {ok, Data :: term()} | not_supported | {error, Reason :: string()}.
+-spec lock() -> {ok, Data :: term()} | not_supported | {error, Reason :: string()}.
lock() ->
Backend = backend(),