From 2e4d5a64c9a1a3c7bea536e341243d524270baa0 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 14 Aug 2025 15:39:31 +0800 Subject: [PATCH] fix agent --- .../{efka_agent.erl => efka_remote_agent.erl} | 20 +++++++++---------- apps/efka/src/efka_service.erl | 4 ++-- apps/efka/src/efka_std_modbus_service.erl | 4 ++-- apps/efka/src/efka_sup.erl | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) rename apps/efka/src/{efka_agent.erl => efka_remote_agent.erl} (95%) diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_remote_agent.erl similarity index 95% rename from apps/efka/src/efka_agent.erl rename to apps/efka/src/efka_remote_agent.erl index c839dc1..7bc5f0e 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_remote_agent.erl @@ -6,7 +6,7 @@ %%% @end %%% Created : 21. 5月 2025 18:38 %%%------------------------------------------------------------------- --module(efka_agent). +-module(efka_remote_agent). -author("anlicheng"). -include("message_pb.hrl"). -include("efka.hrl"). @@ -182,7 +182,7 @@ handle_event(info, {connect_reply, Reply}, ?STATE_CONNECTING, State = #state{tra efka_transport:auth_request(TransportPid, AuthBin), {next_state, ?STATE_AUTH, State}; {error, Reason} -> - lager:debug("[efka_agent] connect failed, error: ~p, pid: ~p", [Reason, TransportPid]), + lager:debug("[efka_remote_agent] connect failed, error: ~p, pid: ~p", [Reason, TransportPid]), efka_transport:stop(TransportPid), {next_state, ?STATE_DENIED, State#state{transport_pid = undefined}} end; @@ -193,26 +193,26 @@ handle_event(info, {auth_reply, Reply}, ?STATE_AUTH, State = #state{transport_pi #auth_reply{code = Code, message = Message} = message_pb:decode_msg(ReplyBin, auth_reply), case Code of 0 -> - lager:debug("[efka_agent] auth success, message: ~p", [Message]), + lager:debug("[efka_remote_agent] auth success, message: ~p", [Message]), {next_state, ?STATE_ACTIVATED, State, [{next_event, info, flush_cache}]}; 1 -> %% 主机在后台的授权未通过；此时agent不能推送数据给云端服务器，但是云端服务器可以推送命令给agent %% socket的连接状态需要维持 - lager:debug("[efka_agent] auth denied, message: ~p", [Message]), + lager:debug("[efka_remote_agent] auth denied, message: ~p", [Message]), {next_state, ?STATE_RESTRICTED, State}; 2 -> % 其他类型的错误，需要间隔时间重试 - lager:debug("[efka_agent] auth failed, message: ~p", [Message]), + lager:debug("[efka_remote_agent] auth failed, message: ~p", [Message]), efka_transport:stop(TransportPid), {next_state, ?STATE_DENIED, State#state{transport_pid = undefined}}; _ -> % 其他类型的错误，需要间隔时间重试 - lager:debug("[efka_agent] auth failed, invalid message"), + lager:debug("[efka_remote_agent] auth failed, invalid message"), efka_transport:stop(TransportPid), {next_state, ?STATE_DENIED, State#state{transport_pid = undefined}} end; {error, Reason} -> - lager:debug("[efka_agent] auth_request failed, error: ~p", [Reason]), + lager:debug("[efka_remote_agent] auth_request failed, error: ~p", [Reason]), efka_transport:stop(TransportPid), {next_state, ?STATE_DENIED, State#state{transport_pid = undefined}} end; @@ -315,7 +315,7 @@ handle_event(info, {server_async_call, PacketId, <>}, ?STATE_ACTIVATED, State = #state{transport_pid = TransportPid}) -> #fetch_task_log{task_id = TaskId} = message_pb:decode_msg(TaskLogBin, fetch_task_log), - lager:debug("[efka_agent] get task_log request: ~p", [TaskId]), + lager:debug("[efka_remote_agent] get task_log request: ~p", [TaskId]), {ok, Logs} = efka_inetd_task_log:get_logs(TaskId), Reply = case length(Logs) > 0 of true -> @@ -345,7 +345,7 @@ handle_event(info, {server_command, ?COMMAND_AUTH, <>}, StateName, State %% 处理Pub/Sub机制 handle_event(info, {server_pub, Topic, Content}, ?STATE_ACTIVATED, State) -> - lager:debug("[efka_agent] get pub topic: ~p, content: ~p", [Topic, Content]), + lager:debug("[efka_remote_agent] get pub topic: ~p, content: ~p", [Topic, Content]), %% 消息发送到订阅系统 efka_subscription:publish(Topic, Content), {keep_state, State}; @@ -391,7 +391,7 @@ handle_event(info, {timeout, _, {request_timeout, Ref}}, ?STATE_ACTIVATED, State %% transport进程退出 handle_event(info, {'DOWN', MRef, process, TransportPid, Reason}, _, State = #state{transport_ref = MRef}) -> - lager:debug("[efka_agent] transport pid: ~p, exit with reason: ~p", [TransportPid, Reason]), + lager:debug("[efka_remote_agent] transport pid: ~p, exit with reason: ~p", [TransportPid, Reason]), erlang:start_timer(5000, self(), create_transport), {next_state, ?STATE_DENIED, State#state{transport_pid = undefined, transport_ref = undefined}}. diff --git a/apps/efka/src/efka_service.erl b/apps/efka/src/efka_service.erl index b316d7f..bc95ccf 100644 --- a/apps/efka/src/efka_service.erl +++ b/apps/efka/src/efka_service.erl @@ -157,11 +157,11 @@ handle_call(_Request, _From, State = #state{}) -> {stop, Reason :: term(), NewState :: #state{}}). handle_cast({metric_data, DeviceUUID, LineProtocolData}, State = #state{service_id = ServiceId}) -> lager:debug("[efka_service] metric_data service_id: ~p, device_uuid: ~p, metric data: ~p", [ServiceId, DeviceUUID, LineProtocolData]), - efka_agent:metric_data(ServiceId, DeviceUUID, LineProtocolData), + efka_remote_agent:metric_data(ServiceId, DeviceUUID, LineProtocolData), {noreply, State}; handle_cast({send_event, EventType, Params}, State = #state{service_id = ServiceId}) -> - efka_agent:event(ServiceId, EventType, Params), + efka_remote_agent:event(ServiceId, EventType, Params), lager:debug("[efka_service] send_event, service_id: ~p, event_type: ~p, params: ~p", [ServiceId, EventType, Params]), {noreply, State}; diff --git a/apps/efka/src/efka_std_modbus_service.erl b/apps/efka/src/efka_std_modbus_service.erl index 15fdb23..d4029a3 100644 --- a/apps/efka/src/efka_std_modbus_service.erl +++ b/apps/efka/src/efka_std_modbus_service.erl @@ -157,11 +157,11 @@ handle_call(_Request, _From, State = #state{}) -> {stop, Reason :: term(), NewState :: #state{}}). handle_cast({metric_data, DeviceUUID, LineProtocolData}, State = #state{service_id = ServiceId}) -> lager:debug("[efka_service] metric_data service_id: ~p, device_uuid: ~p, metric data: ~p", [ServiceId, DeviceUUID, LineProtocolData]), - efka_agent:metric_data(ServiceId, DeviceUUID, LineProtocolData), + efka_remote_agent:metric_data(ServiceId, DeviceUUID, LineProtocolData), {noreply, State}; handle_cast({send_event, EventType, Params}, State = #state{service_id = ServiceId}) -> - efka_agent:event(ServiceId, EventType, Params), + efka_remote_agent:event(ServiceId, EventType, Params), lager:debug("[efka_service] send_event, service_id: ~p, event_type: ~p, params: ~p", [ServiceId, EventType, Params]), {noreply, State}; diff --git a/apps/efka/src/efka_sup.erl b/apps/efka/src/efka_sup.erl index 9e95ea3..c9a3701 100644 --- a/apps/efka/src/efka_sup.erl +++ b/apps/efka/src/efka_sup.erl @@ -65,12 +65,12 @@ init([]) -> }, #{ - id => 'efka_agent', - start => {'efka_agent', start_link, []}, + id => 'efka_remote_agent', + start => {'efka_remote_agent', start_link, []}, restart => permanent, shutdown => 2000, type => worker, - modules => ['efka_agent'] + modules => ['efka_remote_agent'] }, #{