Skip to content

Commit 31854c2

Browse files
committed
Debug epmd flappiness
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
1 parent fb1782a commit 31854c2

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

libs/estdlib/src/erl_epmd.erl

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,27 @@ names(Host) ->
140140
receive_names_loop(Socket, <<>>, []);
141141
{ok, Unexpected} ->
142142
{error, {unexpected, Unexpected}};
143-
{error, _} = ErrRecv ->
144-
ErrRecv
143+
{error, Reason1} ->
144+
{error, {?MODULE, ?LINE, Reason1}}
145145
end;
146-
{error, _} = ErrSend ->
147-
ErrSend
146+
{error, Reason2} ->
147+
{error, {?MODULE, ?LINE, Reason2}}
148148
end,
149149
ok = socket:close(Socket),
150150
Result;
151-
{error, _} = ErrConnect ->
152-
ErrConnect
151+
{error, Reason3} ->
152+
{error, {?MODULE, ?LINE, Reason3}}
153153
end;
154-
{error, _} = ErrGetAddr ->
155-
ErrGetAddr
154+
{error, Reason4} ->
155+
{error, {?MODULE, ?LINE, Reason4}}
156156
end.
157157

158158
receive_names_loop(Socket, AccBuffer, AccL) ->
159159
case binary:split(AccBuffer, <<"\n">>) of
160160
[AccBuffer] ->
161161
case socket:recv(Socket, 0, ?TIMEOUT) of
162162
{error, closed} when AccBuffer =:= <<>> -> {ok, lists:reverse(AccL)};
163-
{error, _} = ErrT -> ErrT;
163+
{error, Reason} -> {error, {?MODULE, ?LINE, Reason}};
164164
{ok, Data} -> receive_names_loop(Socket, <<Data/binary, AccBuffer/binary>>, AccL)
165165
end;
166166
[<<"name ", RestLine/binary>>, RestBuffer] ->
@@ -254,11 +254,11 @@ send_request(Socket, Request) ->
254254
receive_alive2_x_resp(Socket);
255255
{ok, <<?ALIVE2_RESP>>} ->
256256
receive_alive2_resp(Socket);
257-
{error, _} = ErrorRecv2 ->
258-
ErrorRecv2
257+
{error, Reason2} ->
258+
{error, {?MODULE, ?LINE, Reason2}}
259259
end;
260-
{error, _} = ErrorSend ->
261-
ErrorSend
260+
{error, Reason1} ->
261+
{error, {?MODULE, ?LINE, Reason1}}
262262
end.
263263

264264
receive_port2_resp(Socket) ->
@@ -285,32 +285,32 @@ receive_port2_resp(Socket) ->
285285
highest_version = HighestVersion,
286286
lowest_version = LowestVersion
287287
}};
288-
{error, _} = ErrT1 ->
289-
ErrT1
288+
{error, Reason1} ->
289+
{error, {?MODULE, ?LINE, Reason1}}
290290
end
291291
end;
292-
{error, _} = ErrT2 ->
293-
ErrT2
292+
{error, Reason2} ->
293+
{error, {?MODULE, ?LINE, Reason2}}
294294
end;
295-
{error, _} = ErrT3 ->
296-
ErrT3
295+
{error, Reason3} ->
296+
{error, {?MODULE, ?LINE, Reason3}}
297297
end;
298298
{ok, <<N>>} ->
299299
{error, N};
300-
{error, _} = ErrT4 ->
301-
ErrT4
300+
{error, Reason4} ->
301+
{error, {?MODULE, ?LINE, Reason4}}
302302
end.
303303

304304
receive_alive2_x_resp(Socket) ->
305305
case socket:recv(Socket, 5, ?TIMEOUT) of
306306
{ok, <<0, Creation:32>>} -> {ok, #alive2_resp{creation = Creation}};
307307
{ok, <<Err, _:32>>} -> {error, Err};
308-
{error, _} = ErrT -> ErrT
308+
{error, Reason} -> {error, {?MODULE, ?LINE, Reason}}
309309
end.
310310

311311
receive_alive2_resp(Socket) ->
312312
case socket:recv(Socket, 5, ?TIMEOUT) of
313313
{ok, <<0, Creation:16>>} -> {ok, #alive2_resp{creation = Creation}};
314314
{ok, <<Err, _:16>>} -> {error, Err};
315-
{error, _} = ErrT -> ErrT
315+
{error, Reason} -> {error, {?MODULE, ?LINE, Reason}}
316316
end.

0 commit comments

Comments
 (0)