From 5a795fc1422ddd7f64c978dbb698b4ec6e15a22f Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Tue, 22 Apr 2025 16:18:40 +0800 Subject: [PATCH] fix --- apps/efka/src/efka_agent.erl | 16 ++++++++++------ apps/efka/src/efka_transport.erl | 1 - 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl index 9a11e85..5560dab 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_agent.erl @@ -19,10 +19,14 @@ %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --define(SERVER, ?MODULE). +-define(SERVER, ?MODULE). + +-define(STATE_DENIED, denied). +-define(STATE_ACTIVATED, activated). -record(state, { - transport_pid :: undefined | pid() + transport_pid :: undefined | pid(), + status = ?STATE_DENIED }). %%%=================================================================== @@ -82,22 +86,22 @@ handle_info({timeout, _, create_transport}, State = #state{}) -> %% 验证通过 {ok, #auth_reply{code = 1, message = Message, repository_url = RepositoryUrl}} -> lager:debug("[efka_agent] auth result: ~p, repository_url: ~p", [Message, RepositoryUrl]), - {noreply, State#state{transport_pid = TransportPid}}; + {noreply, State#state{transport_pid = TransportPid, status = ?STATE_ACTIVATED}}; %% 主机denied状态 {ok, #auth_reply{code = -1, message = Message, repository_url = RepositoryUrl}} -> lager:debug("[efka_agent] auth failed, message: ~p, repository_url: ~p", [Message, RepositoryUrl]), - {noreply, State#state{transport_pid = TransportPid}}; + {noreply, State#state{transport_pid = TransportPid, status = ?STATE_DENIED}}; %% 验证不通过 {ok, #auth_reply{code = -2, message = Message, repository_url = RepositoryUrl}} -> lager:debug("[efka_agent] auth failed, message: ~p, repository_url: ~p", [Message, RepositoryUrl]), - {noreply, State#state{transport_pid = undefined}}; + {noreply, State#state{transport_pid = undefined, status = ?STATE_DENIED}}; {error, Reason} -> lager:debug("[efka_agent] auth_request failed, error: ~p", [Reason]), efka_transport:stop(TransportPid), - {noreply, State#state{transport_pid = undefined}} + {noreply, State#state{transport_pid = undefined, status = ?STATE_DENIED}} end; handle_info({'EXIT', _Pid, Reason}, State = #state{}) -> diff --git a/apps/efka/src/efka_transport.erl b/apps/efka/src/efka_transport.erl index 10e3688..32027fa 100644 --- a/apps/efka/src/efka_transport.erl +++ b/apps/efka/src/efka_transport.erl @@ -106,7 +106,6 @@ handle_call({auth_request, Timeout}, _From, State = #state{socket = Socket, pack %% 需要等待auth返回的结果 receive {ssl, Socket, <>} -> - lager:debug("[efka_agent] get a reply bin: ~p", [ReplyBin]), {reply, {ok, message_pb:decode_msg(ReplyBin, auth_reply)}, State#state{packet_id = PacketId + 1}} after Timeout ->