Skip to content

Error handling improvements in rabbit_epmd_monitor:check_epmd/1 #2131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2019
Merged

Error handling improvements in rabbit_epmd_monitor:check_epmd/1 #2131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde2a47
Error handling improvements in rabbit_epmd_monitor:check_epmd/1
michaelklishin Oct 3, 2019
ef580fb
Format host atoms as strings
lukebakken Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/rabbit_epmd_monitor.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,29 @@ init_handle_port_please(noport, Mod, Me, Host) ->
me = Me,
host = Host,
port = undefined},
rabbit_log:info("epmd does not know us, re-registering as ~s~n", [Me]),
{ok, ensure_timer(State)};
init_handle_port_please({port, Port, _Version}, Mod, Me, Host) ->
rabbit_log:info("epmd monitor knows us, inter-node communication (distribution) port: ~p", [Port]),
State = #state{mod = Mod,
me = Me,
host = Host,
port = Port},
{ok, ensure_timer(State)};
init_handle_port_please({error, Error}, Mod, Me, Host) ->
rabbit_log:error("epmd monitor failed to retrieve our port from epmd: ~p", [Error]),
State = #state{mod = Mod,
me = Me,
host = Host,
port = undefined},
{ok, ensure_timer(State)}.

handle_call(_Request, _From, State) ->
{noreply, State}.

handle_cast(check, State0) ->
{ok, State1} = check_epmd(State0),
{noreply, ensure_timer(State1#state{timer = undefined})};
handle_cast(_Msg, State) ->
{noreply, State}.

Expand All @@ -95,14 +107,19 @@ check_epmd(State = #state{mod = Mod,
me = Me,
host = Host,
port = Port}) ->
rabbit_log:debug("Asked to [re-]register this node (~s@~s) with epmd...", [Me, Host]),
Port1 = case Mod:port_please(Me, Host) of
noport ->
rabbit_log:warning("epmd does not know us, re-registering ~s at port ~b~n",
[Me, Port]),
Port;
{port, NewPort, _Version} ->
NewPort
NewPort;
{error, Error} ->
rabbit_log:error("epmd monitor failed to retrieve our port from epmd: ~p", [Error]),
Port
end,
rabbit_nodes:ensure_epmd(),
Mod:register_node(Me, Port1),
rabbit_log:debug("[Re-]registered this node (~s@~s) with epmd at port ~p", [Me, Host, Port1]),
{ok, State#state{port = Port1}}.