From 8b2e3906cc8982b280ea5d27736d0962e5e71a6e Mon Sep 17 00:00:00 2001 From: Sergey Prokhorov Date: Wed, 30 May 2018 11:25:34 +0200 Subject: [PATCH] Fix timeout state switch --- README.md | 7 +++++++ src/mtp_handler.erl | 7 ++++--- src/mtproto_proxy.app.src | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ddad506..110b62c 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,13 @@ Stop proxy started in background ./_build/default/rel/mtp_proxy/bin/mtp_proxy stop ``` +Settings +-------- + +See `src/mtproto_proxy.app.src`. + +Secret key will be printed on start. + Helpers ------- diff --git a/src/mtp_handler.erl b/src/mtp_handler.erl index 74247b0..31cbd67 100644 --- a/src/mtp_handler.erl +++ b/src/mtp_handler.erl @@ -230,9 +230,10 @@ handle_upstream_header(Endpoint, UpCodec, S) -> EndpointStr = inet:ntoa(Endpoint), lager:info("Connected to ~s:~p", [EndpointStr, 443]), ok = gen_tcp:send(Sock, <<239>>), - {ok, S#state{stage = tunnel, - down_sock = Sock, - up_codec = UpCodec}}; + {ok, switch_timer(S#state{stage = tunnel, + down_sock = Sock, + up_codec = UpCodec}, + hibernate)}; {error, _Reason} = Err -> Err end. diff --git a/src/mtproto_proxy.app.src b/src/mtproto_proxy.app.src index 859bedd..3303f97 100644 --- a/src/mtproto_proxy.app.src +++ b/src/mtproto_proxy.app.src @@ -11,6 +11,10 @@ stdlib ]}, {env,[ + {init_timeout_sec, 60}, + {hibernate_timeout_sec, 60}, + {ready_timeout_sec, 1200}, + {ip, {0, 0, 0, 0}}, {ports, [{mtp_handler, 4430}]}, {num_acceptors, 60},