From 5174eed7c466963ffa06046a4cc2a5545e139764 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 8 May 2025 11:50:58 +0800 Subject: [PATCH] fix --- apps/efka/src/client/efka_client.erl | 8 -------- apps/efka/src/efka_agent.erl | 17 +---------------- apps/efka/src/efka_service.erl | 9 +-------- apps/efka/src/efka_tcp_channel.erl | 6 ------ message_pb.proto | 6 ------ 5 files changed, 2 insertions(+), 44 deletions(-) diff --git a/apps/efka/src/client/efka_client.erl b/apps/efka/src/client/efka_client.erl index cf5c056..e828696 100644 --- a/apps/efka/src/client/efka_client.erl +++ b/apps/efka/src/client/efka_client.erl @@ -37,7 +37,6 @@ %% 微服务事件上报 -define(PACKET_EVENT, 15). --define(PACKET_AI_EVENT, 16). %% API -export([start_link/3]). @@ -188,13 +187,6 @@ handle_cast({send_event, EventType, Params}, State = #state{socket = Socket}) -> {noreply, State}; -%% done -handle_cast({send_ai_event, EventType, Params}, State = #state{socket = Socket}) -> - Packet = <<0:32, ?PACKET_AI_EVENT:8, EventType:16, Params/binary>>, - ok = gen_tcp:send(Socket, Packet), - - {noreply, State}; - handle_cast(_Info, State = #state{}) -> {noreply, State}. diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl index b9c95a4..70c20e6 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_agent.erl @@ -16,7 +16,7 @@ %% API -export([start_link/0]). --export([metric_data/3, event/3, ai_event/3, ping/13, feedback_phase/3]). +-export([metric_data/3, event/3, ping/13, feedback_phase/3]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -59,10 +59,6 @@ feedback_phase(TaskId, Timestamp, Phase) when is_integer(TaskId), is_integer(Tim event(ServiceId, EventType, Params) when is_binary(ServiceId), is_integer(EventType), is_binary(Params) -> gen_server:cast(?SERVER, {event, ServiceId, EventType, Params}). --spec ai_event(ServiceId :: binary(), EventType :: integer(), Params :: binary()) -> no_return(). -ai_event(ServiceId, EventType, Params) when is_binary(ServiceId), is_integer(EventType), is_binary(Params) -> - gen_server:cast(?SERVER, {ai_event, ServiceId, EventType, Params}). - %% @doc Spawns the server and registers the local name (unique) -spec(start_link() -> {ok, Pid :: pid()} | ignore | {error, Reason :: term()}). @@ -126,17 +122,6 @@ handle_cast({event, ServiceId, EventType, Params}, State) -> {noreply, State}; -%% AiEvent事件 -handle_cast({ai_event, ServiceId, EventType, Params}, State) -> - EventPacket = message_pb:encode_msg(#ai_event{ - service_id = ServiceId, - event_type = EventType, - params = Params - }), - safe_send(?METHOD_AI_EVENT, EventPacket, State), - - {noreply, State}; - handle_cast({feedback_phase, TaskId, Timestamp, Phase}, State) -> PhasePacket = message_pb:encode_msg(#feedback_phase{ task_id = TaskId, diff --git a/apps/efka/src/efka_service.erl b/apps/efka/src/efka_service.erl index 2fb79a0..dcb924d 100644 --- a/apps/efka/src/efka_service.erl +++ b/apps/efka/src/efka_service.erl @@ -21,7 +21,7 @@ -export([start_link/2]). -export([get_name/1, get_pid/1, start_service/1, stop_service/1, attach_channel/2]). -export([push_config/3, request_config/1]). --export([metric_data/3, send_event/3, send_ai_event/3]). +-export([metric_data/3, send_event/3]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -79,9 +79,6 @@ metric_data(Pid, DeviceUUID, Data) when is_pid(Pid), is_binary(DeviceUUID), is_b send_event(Pid, EventType, Params) when is_pid(Pid), is_integer(EventType), is_binary(Params) -> gen_server:cast(Pid, {send_event, EventType, Params}). -send_ai_event(Pid, EventType, Params) when is_pid(Pid), is_integer(EventType), is_binary(Params) -> - gen_server:cast(Pid, {send_ai_event, EventType, Params}). - -spec attach_channel(pid(), pid()) -> ok | {error, Reason :: binary()}. attach_channel(Pid, ChannelPid) when is_pid(Pid), is_pid(ChannelPid) -> gen_server:call(Pid, {attach_channel, ChannelPid}). @@ -216,10 +213,6 @@ handle_cast({send_event, EventType, Params}, State = #state{service_id = Service efka_agent:event(ServiceId, EventType, Params), {noreply, State}; -handle_cast({send_ai_event, EventType, Params}, State = #state{service_id = ServiceId}) -> - efka_agent:ai_event(ServiceId, EventType, Params), - {noreply, State}; - %% 推送配置项目 handle_cast({push_config, Ref, ReceiverPid, ConfigJson}, State = #state{running_status = ?STATUS_RUNNING, channel_pid = ChannelPid, inflight = Inflight}) -> case is_pid(ChannelPid) andalso is_process_alive(ChannelPid) of diff --git a/apps/efka/src/efka_tcp_channel.erl b/apps/efka/src/efka_tcp_channel.erl index 1ac2cd6..a71c9d8 100644 --- a/apps/efka/src/efka_tcp_channel.erl +++ b/apps/efka/src/efka_tcp_channel.erl @@ -37,7 +37,6 @@ %% 微服务事件上报 -define(PACKET_EVENT, 15). --define(PACKET_AI_EVENT, 16). -record(state, { packet_id = 1, @@ -143,11 +142,6 @@ handle_info({tcp, Socket, <<0:32, ?PACKET_EVENT:8, EventType:16, Params/binary>> efka_service:send_event(ServicePid, EventType, Params), {noreply, State}; -%% AIEvent事件 -handle_info({tcp, Socket, <<0:32, ?PACKET_AI_EVENT:8, EventType:16, Params/binary>>}, State = #state{socket = Socket, service_pid = ServicePid, is_registered = true}) -> - efka_service:send_ai_event(ServicePid, EventType, Params), - {noreply, State}; - %% 收到端上的响应 handle_info({tcp, Socket, <>}, State = #state{socket = Socket, inflight = Inflight}) -> case maps:take(PacketId, Inflight) of diff --git a/message_pb.proto b/message_pb.proto index baae6a1..b724afb 100644 --- a/message_pb.proto +++ b/message_pb.proto @@ -106,10 +106,4 @@ message Event { string service_id = 1; uint32 event_type = 2; string params = 3; -} - -message AIEvent { - string service_id = 1; - uint32 event_type = 2; - string params = 3; } \ No newline at end of file