CERBERUS/mtproto_proxy
1
0
Fork 0
mirror of https://github.com/seriyps/mtproto_proxy.git synced 2026-08-04 15:19:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Detect downstream connection attempt failure quicker

Browse source 
By checking for monitor message
This commit is contained in:
Сергей Прохоров 2019-01-19 23:59:58 +01:00
parent 79fb6015f6
commit 8026fb5552
No known key found for this signature in database
GPG key ID: 1C570244E4EF3337
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/mtp_dc_pool.erl
View file

@ -173,13 +173,13 @@ handle_down(MonRef, Pid, #state{downstreams = Ds,
{Pid, DsM1} ->
Pending1 = lists:delete(Pid, Pending),
Ds1 = ds_remove(Pid, Ds),
lager:warning("Downstream=~p is down", [Pid]),
lager:error("Downstream=~p is down", [Pid]),
St#state{pending_downstreams = Pending1,
downstreams = Ds1,
downstream_monitors = DsM1};
_ ->
lager:warning("Unexpected DOWN. ref=~p, pid=~p",
[MonRef, Pid]),
lager:error("Unexpected DOWN. ref=~p, pid=~p",
[MonRef, Pid]),
St
end
end.
@ -211,7 +211,6 @@ connect_many(ToSpawn, St) ->
connect(#state{pending_downstreams = Pending,
downstream_monitors = DsM,
dc_id = DcId} = St) ->
%% Should monitor connection PIDs as well!
Pid = do_connect(DcId),
MonRef = erlang:monitor(process, Pid),
St#state{pending_downstreams = [Pid | Pending],
@ -223,12 +222,19 @@ do_connect(DcId) ->
Pid.
%% Block until all async connections are acked
wait_pending(#state{pending_downstreams = Pending} = St) ->
wait_pending(#state{pending_downstreams = Pending,
downstream_monitors = DsM} = St) ->
lists:foldl(
fun(Pid, #state{pending_downstreams = [Pid | Remaining],
downstreams = Ds} = St1) ->
receive
{'$gen_cast', {connected, Pid}} -> Pid
{'$gen_cast', {connected, Pid}} -> Pid;
{'DOWN', MonitorRef, process, Pid, Reason} ->
%% maybe try to re-connect?
(maps:get(MonitorRef, DsM, undefined) == Pid)
orelse exit({unexpected_down,
MonitorRef, Pid, Reason}),
exit({connection_failed, Pid, Reason})
after 10000 ->
exit({timeout, receive Smth -> Smth after 0 -> none end})
end,