Use OTP logger instead of lager.

Author: seriyps

README.md

@@ -253,7 +253,12 @@ To change default settings, change `mtproto_proxy` section of `prod-sys.config`
     ]}
    ]},
 
- {lager,
+ {kernel,
+  [{logger_level, info},
+   {logger,
+    [{handler, default, logger_std_h,
+      #{config => #{file => "/var/log/mtproto-proxy/application.log"}}}
+    ]}]},
 <...>
 ```
 (so, remove `%%`s) and replace `port` / `secret` / `tag` with yours.
@@ -281,7 +286,7 @@ To do so, just add more configs to `ports` section, separated by comma, eg:
     ]}
    ]},
 
- {lager,
+ {kernel,
 <...>
 ```
 
@@ -453,7 +458,7 @@ different `listen_ip` (one v4 and one v6):
     ]}
    ]},
 
- {lager,
+ {kernel,
 <...>
 ```
 

config/sys.config.example

@@ -16,30 +16,19 @@
    ]},
 
  %% Logging config
- {lager,
-  [{log_root, "/var/log/mtproto-proxy"},
-   {crash_log, "crash.log"},
-   {handlers,
-    [
-     {lager_console_backend,
-      [{level, critical}]},
-
-     {lager_file_backend,
-      [{file, "application.log"},
-       {level, info},
-
-       %% Do fsync only on critical messages
-       {sync_on, critical},
-       %% If we logged more than X messages in a second, flush the rest
-       {high_water_mark, 300},
-       %% If we hit hwm and msg queue len is >X, flush the queue
-       {flush_queue, true},
-       {flush_threshold, 2000},
-       %% How often to check if log should be rotated
-       {check_interval, 5000},
-       %% Rotate when file size is 100MB+
-       {size, 104857600}
-      ]}
+ {kernel,
+  [{logger_level, info},
+   {logger,
+    [{handler, default, logger_std_h,
+      #{level => info,
+        config => #{type => file,
+                    file => "/var/log/mtproto-proxy/application.log",
+                    max_no_bytes => 104857600,  % 100MB
+                    max_no_files => 10,
+                    filesync_repeat_interval => no_repeat}}},
+     {handler, console, logger_std_h,
+      #{level => critical,
+        config => #{type => standard_io}}}
     ]}]},
  {sasl,
   [{errlog_type, error}]}

rebar.config

@@ -1,11 +1,7 @@
 % -*- mode: erlang -*-
-{erl_opts, [debug_info,
-            {d, 'HUT_LAGER'},
-            {parse_transform, lager_transform}]}.
+{erl_opts, [debug_info]}.
 
 {deps, [{ranch, "1.7.0"},
-        {hut, "1.3.0"},
-        {lager, "3.9.1"},
         {erlang_psq, {git, "https://github.com/seriyps/psq", {branch, "master"}}}
         ]}.
 {project_plugins, [rebar3_proper,
@@ -22,8 +18,7 @@
   ]}.
 
 {relx, [{release, { mtp_proxy, "0.1.0" },
-         [lager,
-          ranch,
+         [ranch,
           mtproto_proxy,
           sasl]},
 

src/mtp_config.erl

@@ -32,7 +32,7 @@
 -type netloc() :: {inet:ip4_address(), inet:port_number()}.
 -type netloc_v4v6() :: {inet:ip_address(), inet:port_number()}.
 
--include_lib("hut/include/hut.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -define(TAB, ?MODULE).
 -define(IPS_KEY(DcId), {id, DcId}).
@@ -145,7 +145,7 @@ handle_call(_Request, _From, State) ->
 
 handle_cast(update, #state{timer = Timer} = State) ->
     update(State, soft),
-    ?log(info, "Config updated"),
+    ?LOG_INFO("Config updated"),
     Timer1 = gen_timeout:bump(
                gen_timeout:reset(Timer)),
     {noreply, State#state{timer = Timer1}}.
@@ -154,7 +154,7 @@ handle_info(timeout, #state{timer = Timer} =State) ->
     case gen_timeout:is_expired(Timer) of
         true ->
             update(State, soft),
-            ?log(info, "Config updated"),
+            ?LOG_INFO("Config updated"),
             Timer1 = gen_timeout:bump(
                        gen_timeout:reset(Timer)),
             {noreply, State#state{timer = Timer1}};
@@ -177,8 +177,8 @@ update(#state{tab = Tab}, force) ->
 update(State, _) ->
     try update(State, force)
     catch Class:Reason:Stack ->
-            ?log(error, "Err updating proxy settings: ~s",
-                 [lager:pr_stacktrace(Stack, {Class, Reason})]) %XXX lager-specific
+            ?LOG_ERROR("Err updating proxy settings: ~s",
+                 [erl_error:format_exception(Class, Reason, Stack)])
     end.
 
 update_key(Tab) ->
@@ -249,8 +249,8 @@ update_ip([Url | Fallbacks]) ->
         {ok, _} = inet:parse_ipv4strict_address(IpStr), %assert
         application:set_env(?APP, external_ip, IpStr)
     catch Class:Reason:Stack ->
-            ?log(error, "Failed to update IP with ~s service: ~s",
-                 [Url, lager:pr_stacktrace(Stack, {Class, Reason})]), %XXX - lager-specific
+            ?LOG_ERROR("Failed to update IP with ~s service: ~s",
+                 [Url, erl_error:format_exception(Class, Reason, Stack)]),
             update_ip(Fallbacks)
     end;
 update_ip([]) ->

src/mtp_dc_pool.erl

@@ -28,7 +28,7 @@
          terminate/2, code_change/3]).
 -export_type([status/0]).
 
--include_lib("hut/include/hut.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -define(SERVER, ?MODULE).
 -define(APP, mtproto_proxy).
@@ -194,13 +194,13 @@ handle_down(MonRef, Pid, Reason, #state{downstreams = Ds,
                 {Pid, DsM1} ->
                     Pending1 = lists:delete(Pid, Pending),
                     Ds1 = ds_remove(Pid, Ds),
-                    ?log(error, "Downstream=~p is down. reason=~p", [Pid, Reason]),
+                    ?LOG_ERROR("Downstream=~p is down. reason=~p", [Pid, Reason]),
                     maybe_restart_connection(
                       St#state{pending_downstreams = Pending1,
                                downstreams = Ds1,
                                downstream_monitors = DsM1});
                 _ ->
-                    ?log(error, "Unexpected DOWN. ref=~p, pid=~p, reason=~p", [MonRef, Pid, Reason]),
+                    ?LOG_ERROR("Unexpected DOWN. ref=~p, pid=~p, reason=~p", [MonRef, Pid, Reason]),
                     St
             end
     end.
@@ -321,7 +321,7 @@ ds_return(Pid, St) ->
         {ok, St1} ->
             St1;
         undefined ->
-            ?log(warning, "Attempt to release unknown connection ~p", [Pid]),
+            ?LOG_WARNING("Attempt to release unknown connection ~p", [Pid]),
             St
     end.
 

src/mtp_down_conn.erl

@@ -27,7 +27,7 @@
          terminate/2, code_change/3]).
 -export_type([handle/0, upstream_opts/0]).
 
--include_lib("hut/include/hut.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -define(SERVER, ?MODULE).
 -define(APP, mtproto_proxy).
@@ -129,12 +129,12 @@ handle_call({set_config, Name, Value}, _From, State) ->
                         {{ok, State#state.backpressure_conf},
                           State#state{backpressure_conf = BpConfig}}
                 catch Type:Reason ->
-                        ?log(error, "~p: not updating downstream_backpressure: ~p",
+                        ?LOG_ERROR("~p: not updating downstream_backpressure: ~p",
                              [Type, Reason]),
                         {ignored, State}
                 end;
             _ ->
-                ?log(warning, "set_config ~p=~p ignored", [Name, Value]),
+                ?LOG_WARNING("set_config ~p=~p ignored", [Name, Value]),
                 {ignored, State}
         end,
     {reply, Response, State1}.
@@ -164,8 +164,8 @@ handle_info(do_connect, #state{dc_id = DcId} = State) ->
         {ok, St1} = connect(DcId, State),
         {noreply, St1}
     catch Class:Reason:Stack ->
-            ?log(error, "Down connect to dc=~w error: ~s",
-                 [DcId, lager:pr_stacktrace(Stack, {Class, Reason})]), %XXX lager-specific
+            ?LOG_ERROR("Down connect to dc=~w error: ~s",
+                 [DcId, erl_error:format_exception(Class, Reason, Stack)]),
             erlang:send_after(300, self(), do_connect),
             {noreply, State}
     end;
@@ -182,7 +182,7 @@ handle_info(handshake_timeout, #state{stage = Stage, dc_id = DcId} = St) ->
 
 terminate(_Reason, #state{upstreams = Ups}) ->
     %% Should I do this or dc_pool? Maybe only when reason is 'normal'?
-    ?log(warning, "Downstream terminates with reason ~p; len(upstreams)=~p",
+    ?LOG_WARNING("Downstream terminates with reason ~p; len(upstreams)=~p",
          [_Reason, map_size(Ups)]),
     Self = self(),
     lists:foreach(
@@ -201,7 +201,7 @@ handle_send(Data, Upstream, #state{upstreams = Ups,
             Packet = mtp_rpc:encode_packet({data, Data}, {UpstreamStatic, ProxyAddr}),
             down_send(Packet, St);
         _ ->
-            ?log(warning, "Upstream=~p not found", [Upstream]),
+            ?LOG_WARNING("Upstream=~p not found", [Upstream]),
             {{error, unknown_upstream}, St}
     end.
 
@@ -214,7 +214,7 @@ handle_upstream_new(Upstream, Opts, #state{upstreams = Ups,
     UpsStatic = {ConnId, iolist_to_binary(mtp_rpc:encode_ip_port(Ip, Port)), AdTag},
     Ups1 = Ups#{Upstream => {UpsStatic, 0, 0}},
     UpsRev1 = UpsRev#{ConnId => Upstream},
-    ?log(debug, "New upstream=~p conn_id=~p", [Upstream, ConnId]),
+    ?LOG_DEBUG("New upstream=~p conn_id=~p", [Upstream, ConnId]),
     St#state{upstreams = Ups1,
              upstreams_rev = UpsRev1}.
 
@@ -232,7 +232,7 @@ handle_upstream_closed(Upstream, #state{upstreams = Ups,
             down_send(Packet, St2);
         error ->
             %% It happens when we get rpc_close_ext
-            ?log(info, "Unknown upstream ~p", [Upstream]),
+            ?LOG_INFO("Unknown upstream ~p", [Upstream]),
             {ok, St}
     end.
 
@@ -282,13 +282,13 @@ handle_rpc({close_ext, ConnId}, St) ->
             St2#state{upstreams = Ups1,
                       upstreams_rev = UpsRev1};
         error ->
-            ?log(warning, "Unknown upstream ~p", [ConnId]),
+            ?LOG_WARNING("Unknown upstream ~p", [ConnId]),
             St1
     end;
 handle_rpc({simple_ack, ConnId, Confirm}, S) ->
     up_send({simple_ack, self(), Confirm}, ConnId, S);
 handle_rpc({unknown, Tag, Tail}, S) ->
-    ?log(info, "Unknown packet from backend. Tag ~w, tail: ~w", [Tag, Tail]),
+    ?LOG_INFO("Unknown packet from backend. Tag ~w, tail: ~w", [Tag, Tail]),
     S.
 
 
@@ -318,7 +318,7 @@ up_send(Packet, ConnId, #state{upstreams_rev = UpsRev} = St) ->
                     St
             end;
         error ->
-            ?log(warning, "Unknown connection_id=~w", [ConnId]),
+            ?LOG_WARNING("Unknown connection_id=~w", [ConnId]),
             %% WHY!!!?
             %% ClosedPacket = mtp_rpc:encode_packet(remote_closed, ConnId),
             %% {ok, St1} = down_send(ClosedPacket, St),
@@ -460,7 +460,7 @@ connect(DcId, S) ->
             mtp_metric:count_inc([?APP, out_connect_ok, total], 1,
                                  #{labels => [DcId]}),
             AddrStr = inet:ntoa(Host),
-            ?log(info, "~s:~p: TCP connected", [AddrStr, Port]),
+            ?LOG_INFO("~s:~p: TCP connected", [AddrStr, Port]),
             down_handshake1(S#state{sock = Sock,
                                     netloc = {Host, Port}});
         {error, Reason} = Err ->
@@ -558,7 +558,7 @@ down_handshake3(Pkt, #state{stage_state = {Deadline, PrevSenderPid}, pool = Pool
     {handshake, _SenderPid, PeerPid} = mtp_rpc:decode_handshake(Pkt),
     (PeerPid == PrevSenderPid) orelse error({wrong_sender_pid, PeerPid}),
     ok = mtp_dc_pool:ack_connected(Pool, self()),
-    ?log(info, "~s:~w: dc=~w handshake complete", [inet:ntoa(Addr), Port, DcId]),
+    ?LOG_INFO("~s:~w: dc=~w handshake complete", [inet:ntoa(Addr), Port, DcId]),
     {ok, S#state{stage = tunnel,
                  stage_state = undefined}}.
 

src/mtp_fake_tls.erl

@@ -28,7 +28,7 @@
 
 -export_type([codec/0, meta/0]).
 
--include_lib("hut/include/hut.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -dialyzer(no_improper_lists).
 
@@ -108,7 +108,7 @@ from_client_hello(Data, Secret) ->
     #client_hello{pseudorandom = ClientDigest,
                   session_id = SessionId,
                   extensions = Extensions} = CliHlo = parse_client_hello(Data),
-    ?log(debug, "TLS ClientHello=~p", [CliHlo]),
+    ?LOG_DEBUG("TLS ClientHello=~p", [CliHlo]),
     ServerDigest = make_server_digest(Data, Secret),
     <<Zeroes:(?DIGEST_LEN - 4)/binary, Timestamp:32/unsigned-little>> = XoredDigest =
         crypto:exor(ClientDigest, ServerDigest),