diff --git a/src/hz_fetcher.erl b/src/hz_fetcher.erl index a7803be..c36cb36 100644 --- a/src/hz_fetcher.erl +++ b/src/hz_fetcher.erl @@ -6,8 +6,6 @@ -export([connect/4, slowly_connect/4]). --include("$zx_include/zx_logger.hrl"). - connect(Node = {Host, Port}, Request, From, Timeout) -> Timer = erlang:send_after(Timeout, self(), timeout), @@ -236,3 +234,10 @@ url({Node, Port}, Path) when is_list(Node) -> ["https://", Node, ":", integer_to_list(Port), Path]; url({Node, Port}, Path) when is_tuple(Node) -> ["https://", inet:ntoa(Node), ":", integer_to_list(Port), Path]. + + + +log(Level, Format, Args) -> + Raw = io_lib:format("~w ~w: " ++ Format, [?MODULE, self() | Args]), + Entry = unicode:characters_to_list(Raw), + logger:log(Level, Entry). diff --git a/src/hz_man.erl b/src/hz_man.erl index 31f7e66..3561848 100644 --- a/src/hz_man.erl +++ b/src/hz_man.erl @@ -29,8 +29,6 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, code_change/3, terminate/2]). -%% TODO: Make logging more flexible --include("$zx_include/zx_logger.hrl"). %%% Type and Record Definitions @@ -197,7 +195,7 @@ handle_info({'DOWN', Mon, process, PID, Info}, State) -> NewState = handle_down(PID, Mon, Info, State), {noreply, NewState}; handle_info(Unexpected, State) -> - ok = log("Unexpected info: ~tp~n", [Unexpected]), + ok = log(warning, "Unexpected info: ~tp~n", [Unexpected]), {noreply, State}. @@ -287,3 +285,10 @@ do_request(Request, do_request(Request, From, State = #s{chain_nodes = {[], Used}}) -> Fresh = lists:reverse(Used), do_request(Request, From, State#s{chain_nodes = {Fresh, []}}). + + + + +log(Level, Format, Args) -> + Raw = io_lib:format("~w ~w: " ++ Format, [?MODULE, self() | Args]), + Entry = unicode:characters_to_list(Raw),