diff --git a/apps/dns_proxy/src/dns_handler.erl b/apps/dns_proxy/src/dns_handler.erl index 45505ea..383b5de 100644 --- a/apps/dns_proxy/src/dns_handler.erl +++ b/apps/dns_proxy/src/dns_handler.erl @@ -177,7 +177,7 @@ resolver0(Packet, QueryMsg = #dns_message{qc = 1, questions = [Question = #dns_q {ok, Resp}; Error -> lager:debug("[dns_handler] parse reply get error: ~p", [Error]), - Error + {error, Error} end after 5000 -> {error, timeout} @@ -186,7 +186,7 @@ resolver0(Packet, QueryMsg = #dns_message{qc = 1, questions = [Question = #dns_q end; resolver0(_, Error) -> lager:warning("[dns_handler] decode dns query get error: ~p", [Error]), - Error. + {error, Error}. -spec forward_to_upstream(Ref :: reference(), Request :: binary(), QueryMsg :: #dns_message{}) -> no_return(). forward_to_upstream(Ref, Request, QueryMsg) -> diff --git a/apps/dns_proxy/src/dns_handler_sup.erl b/apps/dns_proxy/src/dns_handler_sup.erl index 7c7e023..009395d 100644 --- a/apps/dns_proxy/src/dns_handler_sup.erl +++ b/apps/dns_proxy/src/dns_handler_sup.erl @@ -38,11 +38,6 @@ start_link() -> %% this function is called by the new process to find out about %% restart strategy, maximum restart frequency and child %% specifications. --spec(init(Args :: term()) -> - {ok, {SupFlags :: {RestartStrategy :: supervisor:strategy(), - MaxR :: non_neg_integer(), MaxT :: non_neg_integer()}, - [ChildSpec :: supervisor:child_spec()]}} - | ignore | {error, Reason :: term()}). init([]) -> SupFlags = #{strategy => simple_one_for_one, intensity => 0, period => 1}, Spec = #{ diff --git a/apps/dns_proxy/src/dns_zone_loader.erl b/apps/dns_proxy/src/dns_zone_loader.erl deleted file mode 100644 index 64c6247..0000000 --- a/apps/dns_proxy/src/dns_zone_loader.erl +++ /dev/null @@ -1,13 +0,0 @@ --module(dns_zone_loader). --export([load/1]). - --include_lib("dns_erlang/include/dns.hrl"). - -load(Path) -> - {ok, Bin} = file:read_file(Path), - {ok, Records} = dns_zone:decode(Bin), % dns_erlang 提供 - lists:foreach(fun(R) -> - Name = R#dns_rr.name, - dns_cache:insert(Name, R) - end, Records), - ok.