anlicheng/ekfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
anlicheng 2025-05-06 22:18:08 +08:00
parent 8e02d0714c
commit 54cae14ad4
6 changed files with 108 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/efka/include/efka.hrl
View File

@ -34,7 +34,7 @@
%% 部署微服务
-define(METHOD_DEPLOY, 16#10).
-define(METHOD_ARGUMENTS, 16#11).
-define(METHOD_PRAMAS, 16#11).
-define(METHOD_METRICS, 16#12).
%% 事件类型

8
apps/efka/include/message_pb.hrl
View File

@ -61,11 +61,11 @@
}).
-endif.
-ifndef('SERVICE_ARGUMENTS_PB_H').
-define('SERVICE_ARGUMENTS_PB_H', true).
-record(service_arguments,
-ifndef('SERVICE_PARAMS_PB_H').
-define('SERVICE_PARAMS_PB_H', true).
-record(service_params,
{service_id = <<>> :: unicode:chardata() | undefined, % = 1, optional
args = <<>> :: unicode:chardata() | undefined % = 2, optional
params = <<>> :: unicode:chardata() | undefined % = 2, optional
}).
-endif.

58
apps/efka/src/efka_agent.erl
View File

@ -16,7 +16,8 @@
%% API
-export([start_link/0]).
-export([metric_data/5, event/3, ai_event/3, feedback_phase/5]).
-export([metric_data/5, event/3, ai_event/3, ping/13]).
-export([feedback_phase/4, feedback_phase/5]).
%% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
@ -46,29 +47,19 @@ metric_data(ServiceId, DeviceUUID, Timestamp, Tags, Fields) when is_binary(Servi
gen_server:cast(?SERVER, {metric_data, ServiceId, DeviceUUID, Timestamp, Tags, Fields}).
ping(AdCode, BootTime, Province, City, EfkaVersion, KernelArch, Ips, CpuCore, CpuLoad, CpuTemperature, Disk, Memory, Interfaces) ->
Ping = #ping{
adcode = AdCode,
boot_time = BootTime,
province = Province,
city = City,
efka_version = EfkaVersion,
kernel_arch = KernelArch,
ips = Ips,
cpu_core = CpuCore,
cpu_load = CpuLoad,
cpu_temperature = CpuTemperature,
disk = Disk,
memory = Memory,
interfaces = Interfaces
},
gen_server:cast(?SERVER, {ping, Ping}).
gen_server:cast(?SERVER, {ping, AdCode, BootTime, Province, City, EfkaVersion, KernelArch, Ips, CpuCore, CpuLoad, CpuTemperature, Disk, Memory, Interfaces}).
feedback_phase(TaskId, Timestamp, Phase, Code, Message) ->
feedback_phase(TaskId, Timestamp, Phase, Code) when is_integer(TaskId), is_integer(Timestamp), is_binary(Phase), is_integer(Code) ->
gen_server:cast(?SERVER, {feedback_phase, TaskId, Timestamp, Phase, Code, <<"">>}).
feedback_phase(TaskId, Timestamp, Phase, Code, Message) when is_integer(TaskId), is_integer(Timestamp), is_binary(Phase), is_integer(Code), is_binary(Message) ->
gen_server:cast(?SERVER, {feedback_phase, TaskId, Timestamp, Phase, Code, Message}).
-spec event(ServiceId :: binary(), EventType :: integer(), Params :: binary()) -> no_return().
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}).
@ -199,6 +190,29 @@ handle_cast({feedback_phase, TaskId, Timestamp, Phase, Code, Message}, State = #
{noreply, State};
%% 处理ping消息
handle_cast({ping, AdCode, BootTime, Province, City, EfkaVersion, KernelArch, Ips, CpuCore, CpuLoad, CpuTemperature, Disk, Memory, Interfaces},
State = #state{status = Status, transport_pid = TransportPid}) ->
Ping = message_pb:encode_msg(#ping{
adcode = AdCode,
boot_time = BootTime,
province = Province,
city = City,
efka_version = EfkaVersion,
kernel_arch = KernelArch,
ips = Ips,
cpu_core = CpuCore,
cpu_load = CpuLoad,
cpu_temperature = CpuTemperature,
disk = Disk,
memory = Memory,
interfaces = Interfaces
}),
Status =:= ?STATE_ACTIVATED andalso efka_transport:send(TransportPid, ?METHOD_PING, Ping),
{noreply, State};
handle_cast(_Request, State = #state{}) ->
{noreply, State}.
@ -282,8 +296,8 @@ handle_info({server_push_message, PacketId, <<?METHOD_DEPLOY:8, DeployBin/binary
{noreply, State};
%% 参数项目
handle_info({server_push_message, PacketId, <<?METHOD_ARGUMENTS:8, ArgumentsBin/binary>>}, State = #state{transport_pid = TransportPid}) ->
#service_arguments{service_id = ServiceId, args = Args} = message_pb:decode_msg(ArgumentsBin, service_arguments),
handle_info({server_push_message, PacketId, <<?METHOD_PARAMS:8, ParamsBin/binary>>}, State = #state{transport_pid = TransportPid}) ->
#service_params{service_id = ServiceId, params = Params} = message_pb:decode_msg(ParamsBin, service_params),
case efka_micro_service:get_pid(ServiceId) of
undefined ->
@ -293,7 +307,7 @@ handle_info({server_push_message, PacketId, <<?METHOD_ARGUMENTS:8, ArgumentsBin/
},
efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply));
ServicePid when is_pid(ServicePid) ->
case efka_micro_service:push_arguments(ServicePid, Args) of
case efka_micro_service:push_params(ServicePid, Params) of
ok ->
Reply = #efka_response{
code = 1,
@ -318,7 +332,7 @@ handle_info({server_push_message, PacketId, <<?METHOD_METRICS:8, MetricsBin/bina
undefined ->
Reply = #efka_response{
code = 0,
message = <<"服务未启动"/utf8>>
message = <<"service not run">>
},
efka_transport:response(TransportPid, PacketId, message_pb:encode_msg(Reply));
ServicePid when is_pid(ServicePid) ->

4
apps/efka/src/efka_micro_service.erl
View File

@ -20,7 +20,7 @@
%% API
-export([start_link/2]).
-export([get_name/1, get_pid/1, start_service/1, stop_service/1, attach_channel/2]).
-export([push_arguments/2, push_metrics/2, request_arguments/1, request_metrics/1]).
-export([push_params/2, push_metrics/2, request_arguments/1, request_metrics/1]).
-export([metric_data/4, send_event/3, send_ai_event/3]).
%% gen_server callbacks
@ -65,7 +65,7 @@ get_name(ServiceId) when is_binary(ServiceId) ->
get_pid(ServiceId) when is_binary(ServiceId) ->
whereis(get_name(ServiceId)).
push_arguments(Pid, Args) when is_pid(Pid), is_binary(Args) ->
push_params(Pid, Args) when is_pid(Pid), is_binary(Args) ->
gen_server:call(Pid, {push_arguments, Args}).
push_metrics(Pid, Metrics) when is_pid(Pid), is_binary(Metrics) ->

126
apps/efka/src/proto/message_pb.erl
View File

@ -67,7 +67,7 @@
-type topic_message() :: #topic_message{}.
-type service_arguments() :: #service_arguments{}.
-type service_params() :: #service_params{}.
-type service_metrics() :: #service_metrics{}.
@ -83,9 +83,9 @@
-type ai_event() :: #ai_event{}.
-export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'deploy'/0, 'efka_response'/0, 'topic_message'/0, 'service_arguments'/0, 'service_metrics'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_phase'/0, 'event'/0, 'ai_event'/0]).
-type '$msg_name'() :: auth_request | auth_reply | activate_push | deploy | efka_response | topic_message | service_arguments | service_metrics | data | ping | service_inform | feedback_phase | event | ai_event.
-type '$msg'() :: auth_request() | auth_reply() | activate_push() | deploy() | efka_response() | topic_message() | service_arguments() | service_metrics() | data() | ping() | service_inform() | feedback_phase() | event() | ai_event().
-export_type(['auth_request'/0, 'auth_reply'/0, 'activate_push'/0, 'deploy'/0, 'efka_response'/0, 'topic_message'/0, 'service_params'/0, 'service_metrics'/0, 'data'/0, 'ping'/0, 'service_inform'/0, 'feedback_phase'/0, 'event'/0, 'ai_event'/0]).
-type '$msg_name'() :: auth_request | auth_reply | activate_push | deploy | efka_response | topic_message | service_params | service_metrics | data | ping | service_inform | feedback_phase | event | ai_event.
-type '$msg'() :: auth_request() | auth_reply() | activate_push() | deploy() | efka_response() | topic_message() | service_params() | service_metrics() | data() | ping() | service_inform() | feedback_phase() | event() | ai_event().
-export_type(['$msg_name'/0, '$msg'/0]).
-record('map<string,string>',{key, value}).
@ -119,7 +119,7 @@ encode_msg(Msg, MsgName, Opts) ->
deploy -> encode_msg_deploy(id(Msg, TrUserData), TrUserData);
efka_response -> encode_msg_efka_response(id(Msg, TrUserData), TrUserData);
topic_message -> encode_msg_topic_message(id(Msg, TrUserData), TrUserData);
service_arguments -> encode_msg_service_arguments(id(Msg, TrUserData), TrUserData);
service_params -> encode_msg_service_params(id(Msg, TrUserData), TrUserData);
service_metrics -> encode_msg_service_metrics(id(Msg, TrUserData), TrUserData);
data -> encode_msg_data(id(Msg, TrUserData), TrUserData);
ping -> encode_msg_ping(id(Msg, TrUserData), TrUserData);
@ -325,10 +325,10 @@ encode_msg_topic_message(#topic_message{topic = F1, content = F2}, Bin, TrUserDa
end
end.
encode_msg_service_arguments(Msg, TrUserData) -> encode_msg_service_arguments(Msg, <<>>, TrUserData).
encode_msg_service_params(Msg, TrUserData) -> encode_msg_service_params(Msg, <<>>, TrUserData).
encode_msg_service_arguments(#service_arguments{service_id = F1, args = F2}, Bin, TrUserData) ->
encode_msg_service_params(#service_params{service_id = F1, params = F2}, Bin, TrUserData) ->
B1 = if F1 == undefined -> Bin;
true ->
begin
@ -897,7 +897,7 @@ decode_msg_2_doit(activate_push, Bin, TrUserData) -> id(decode_msg_activate_push
decode_msg_2_doit(deploy, Bin, TrUserData) -> id(decode_msg_deploy(Bin, TrUserData), TrUserData);
decode_msg_2_doit(efka_response, Bin, TrUserData) -> id(decode_msg_efka_response(Bin, TrUserData), TrUserData);
decode_msg_2_doit(topic_message, Bin, TrUserData) -> id(decode_msg_topic_message(Bin, TrUserData), TrUserData);
decode_msg_2_doit(service_arguments, Bin, TrUserData) -> id(decode_msg_service_arguments(Bin, TrUserData), TrUserData);
decode_msg_2_doit(service_params, Bin, TrUserData) -> id(decode_msg_service_params(Bin, TrUserData), TrUserData);
decode_msg_2_doit(service_metrics, Bin, TrUserData) -> id(decode_msg_service_metrics(Bin, TrUserData), TrUserData);
decode_msg_2_doit(data, Bin, TrUserData) -> id(decode_msg_data(Bin, TrUserData), TrUserData);
decode_msg_2_doit(ping, Bin, TrUserData) -> id(decode_msg_ping(Bin, TrUserData), TrUserData);
@ -1249,56 +1249,56 @@ skip_32_topic_message(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData)
skip_64_topic_message(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_topic_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
decode_msg_service_arguments(Bin, TrUserData) -> dfp_read_field_def_service_arguments(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
decode_msg_service_params(Bin, TrUserData) -> dfp_read_field_def_service_params(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
dfp_read_field_def_service_arguments(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_arguments_service_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
dfp_read_field_def_service_arguments(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_arguments_args(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
dfp_read_field_def_service_arguments(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_arguments{service_id = F@_1, args = F@_2};
dfp_read_field_def_service_arguments(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_service_arguments(Other, Z1, Z2, F, F@_1, F@_2, TrUserData).
dfp_read_field_def_service_params(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_params_service_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
dfp_read_field_def_service_params(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_service_params_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
dfp_read_field_def_service_params(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_params{service_id = F@_1, params = F@_2};
dfp_read_field_def_service_params(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_service_params(Other, Z1, Z2, F, F@_1, F@_2, TrUserData).
dg_read_field_def_service_arguments(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_arguments(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
dg_read_field_def_service_arguments(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) ->
dg_read_field_def_service_params(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_service_params(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
dg_read_field_def_service_params(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) ->
Key = X bsl N + Acc,
case Key of
10 -> d_field_service_arguments_service_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
18 -> d_field_service_arguments_args(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
10 -> d_field_service_params_service_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
18 -> d_field_service_params_params(Rest, 0, 0, 0, F@_1, F@_2, TrUserData);
_ ->
case Key band 7 of
0 -> skip_varint_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
1 -> skip_64_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
2 -> skip_length_delimited_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
3 -> skip_group_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
5 -> skip_32_service_arguments(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData)
0 -> skip_varint_service_params(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
1 -> skip_64_service_params(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
2 -> skip_length_delimited_service_params(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
3 -> skip_group_service_params(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData);
5 -> skip_32_service_params(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData)
end
end;
dg_read_field_def_service_arguments(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_arguments{service_id = F@_1, args = F@_2}.
dg_read_field_def_service_params(<<>>, 0, 0, _, F@_1, F@_2, _) -> #service_params{service_id = F@_1, params = F@_2}.
d_field_service_arguments_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_arguments_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
d_field_service_arguments_service_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) ->
d_field_service_params_service_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_params_service_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
d_field_service_params_service_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) ->
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
dfp_read_field_def_service_arguments(RestF, 0, 0, F, NewFValue, F@_2, TrUserData).
dfp_read_field_def_service_params(RestF, 0, 0, F, NewFValue, F@_2, TrUserData).
d_field_service_arguments_args(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_arguments_args(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
d_field_service_arguments_args(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) ->
d_field_service_params_params(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_service_params_params(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
d_field_service_params_params(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) ->
{NewFValue, RestF} = begin Len = X bsl N + Acc, <<Bytes:Len/binary, Rest2/binary>> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end,
dfp_read_field_def_service_arguments(RestF, 0, 0, F, F@_1, NewFValue, TrUserData).
dfp_read_field_def_service_params(RestF, 0, 0, F, F@_1, NewFValue, TrUserData).
skip_varint_service_arguments(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_service_arguments(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
skip_varint_service_arguments(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
skip_varint_service_params(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_service_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData);
skip_varint_service_params(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
skip_length_delimited_service_arguments(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_service_arguments(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
skip_length_delimited_service_arguments(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) ->
skip_length_delimited_service_params(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_service_params(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData);
skip_length_delimited_service_params(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) ->
Length = X bsl N + Acc,
<<_:Length/binary, Rest2/binary>> = Rest,
dfp_read_field_def_service_arguments(Rest2, 0, 0, F, F@_1, F@_2, TrUserData).
dfp_read_field_def_service_params(Rest2, 0, 0, F, F@_1, F@_2, TrUserData).
skip_group_service_arguments(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) ->
skip_group_service_params(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) ->
{_, Rest} = read_group(Bin, FNum),
dfp_read_field_def_service_arguments(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData).
dfp_read_field_def_service_params(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData).
skip_32_service_arguments(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
skip_32_service_params(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
skip_64_service_arguments(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_arguments(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
skip_64_service_params(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_service_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData).
decode_msg_service_metrics(Bin, TrUserData) -> dfp_read_field_def_service_metrics(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData).
@ -2019,7 +2019,7 @@ merge_msgs(Prev, New, MsgName, Opts) ->
deploy -> merge_msg_deploy(Prev, New, TrUserData);
efka_response -> merge_msg_efka_response(Prev, New, TrUserData);
topic_message -> merge_msg_topic_message(Prev, New, TrUserData);
service_arguments -> merge_msg_service_arguments(Prev, New, TrUserData);
service_params -> merge_msg_service_params(Prev, New, TrUserData);
service_metrics -> merge_msg_service_metrics(Prev, New, TrUserData);
data -> merge_msg_data(Prev, New, TrUserData);
ping -> merge_msg_ping(Prev, New, TrUserData);
@ -2115,16 +2115,16 @@ merge_msg_topic_message(#topic_message{topic = PFtopic, content = PFcontent}, #t
true -> NFcontent
end}.
-compile({nowarn_unused_function,merge_msg_service_arguments/3}).
merge_msg_service_arguments(#service_arguments{service_id = PFservice_id, args = PFargs}, #service_arguments{service_id = NFservice_id, args = NFargs}, _) ->
#service_arguments{service_id =
if NFservice_id =:= undefined -> PFservice_id;
true -> NFservice_id
end,
args =
if NFargs =:= undefined -> PFargs;
true -> NFargs
end}.
-compile({nowarn_unused_function,merge_msg_service_params/3}).
merge_msg_service_params(#service_params{service_id = PFservice_id, params = PFparams}, #service_params{service_id = NFservice_id, params = NFparams}, _) ->
#service_params{service_id =
if NFservice_id =:= undefined -> PFservice_id;
true -> NFservice_id
end,
params =
if NFparams =:= undefined -> PFparams;
true -> NFparams
end}.
-compile({nowarn_unused_function,merge_msg_service_metrics/3}).
merge_msg_service_metrics(#service_metrics{service_id = PFservice_id, metrics = PFmetrics}, #service_metrics{service_id = NFservice_id, metrics = NFmetrics}, _) ->
@ -2314,7 +2314,7 @@ verify_msg(Msg, MsgName, Opts) ->
deploy -> v_msg_deploy(Msg, [MsgName], TrUserData);
efka_response -> v_msg_efka_response(Msg, [MsgName], TrUserData);
topic_message -> v_msg_topic_message(Msg, [MsgName], TrUserData);
service_arguments -> v_msg_service_arguments(Msg, [MsgName], TrUserData);
service_params -> v_msg_service_params(Msg, [MsgName], TrUserData);
service_metrics -> v_msg_service_metrics(Msg, [MsgName], TrUserData);
data -> v_msg_data(Msg, [MsgName], TrUserData);
ping -> v_msg_ping(Msg, [MsgName], TrUserData);
@ -2413,17 +2413,17 @@ v_msg_topic_message(#topic_message{topic = F1, content = F2}, Path, TrUserData)
ok;
v_msg_topic_message(X, Path, _TrUserData) -> mk_type_error({expected_msg, topic_message}, X, Path).
-compile({nowarn_unused_function,v_msg_service_arguments/3}).
-dialyzer({nowarn_function,v_msg_service_arguments/3}).
v_msg_service_arguments(#service_arguments{service_id = F1, args = F2}, Path, TrUserData) ->
-compile({nowarn_unused_function,v_msg_service_params/3}).
-dialyzer({nowarn_function,v_msg_service_params/3}).
v_msg_service_params(#service_params{service_id = F1, params = F2}, Path, TrUserData) ->
if F1 == undefined -> ok;
true -> v_type_string(F1, [service_id | Path], TrUserData)
end,
if F2 == undefined -> ok;
true -> v_type_string(F2, [args | Path], TrUserData)
true -> v_type_string(F2, [params | Path], TrUserData)
end,
ok;
v_msg_service_arguments(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_arguments}, X, Path).
v_msg_service_params(X, Path, _TrUserData) -> mk_type_error({expected_msg, service_params}, X, Path).
-compile({nowarn_unused_function,v_msg_service_metrics/3}).
-dialyzer({nowarn_function,v_msg_service_metrics/3}).
@ -2724,7 +2724,7 @@ get_msg_defs() ->
#field{name = result, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
#field{name = message, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]},
{{msg, topic_message}, [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]},
{{msg, service_arguments}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = args, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]},
{{msg, service_params}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]},
{{msg, service_metrics}, [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = metrics, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]},
{{msg, data},
[#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
@ -2767,13 +2767,13 @@ get_msg_defs() ->
#field{name = params, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}]}].
get_msg_names() -> [auth_request, auth_reply, activate_push, deploy, efka_response, topic_message, service_arguments, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event].
get_msg_names() -> [auth_request, auth_reply, activate_push, deploy, efka_response, topic_message, service_params, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event].
get_group_names() -> [].
get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, deploy, efka_response, topic_message, service_arguments, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event].
get_msg_or_group_names() -> [auth_request, auth_reply, activate_push, deploy, efka_response, topic_message, service_params, service_metrics, data, ping, service_inform, feedback_phase, event, ai_event].
get_enum_names() -> [].
@ -2810,7 +2810,7 @@ find_msg_def(efka_response) ->
#field{name = result, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []},
#field{name = message, fnum = 3, rnum = 4, type = string, occurrence = optional, opts = []}];
find_msg_def(topic_message) -> [#field{name = topic, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = content, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}];
find_msg_def(service_arguments) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = args, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}];
find_msg_def(service_params) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}];
find_msg_def(service_metrics) -> [#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []}, #field{name = metrics, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}];
find_msg_def(data) ->
[#field{name = service_id, fnum = 1, rnum = 2, type = string, occurrence = optional, opts = []},
@ -2915,7 +2915,7 @@ fqbin_to_msg_name(<<"ActivatePush">>) -> activate_push;
fqbin_to_msg_name(<<"Deploy">>) -> deploy;
fqbin_to_msg_name(<<"EfkaResponse">>) -> efka_response;
fqbin_to_msg_name(<<"TopicMessage">>) -> topic_message;
fqbin_to_msg_name(<<"ServiceArguments">>) -> service_arguments;
fqbin_to_msg_name(<<"ServiceParams">>) -> service_params;
fqbin_to_msg_name(<<"ServiceMetrics">>) -> service_metrics;
fqbin_to_msg_name(<<"Data">>) -> data;
fqbin_to_msg_name(<<"Ping">>) -> ping;
@ -2932,7 +2932,7 @@ msg_name_to_fqbin(activate_push) -> <<"ActivatePush">>;
msg_name_to_fqbin(deploy) -> <<"Deploy">>;
msg_name_to_fqbin(efka_response) -> <<"EfkaResponse">>;
msg_name_to_fqbin(topic_message) -> <<"TopicMessage">>;
msg_name_to_fqbin(service_arguments) -> <<"ServiceArguments">>;
msg_name_to_fqbin(service_params) -> <<"ServiceParams">>;
msg_name_to_fqbin(service_metrics) -> <<"ServiceMetrics">>;
msg_name_to_fqbin(data) -> <<"Data">>;
msg_name_to_fqbin(ping) -> <<"Ping">>;
@ -2978,7 +2978,7 @@ get_all_source_basenames() -> ["message_pb.proto"].
get_all_proto_names() -> ["message_pb"].
get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, deploy, efka_response, event, feedback_phase, ping, service_arguments, service_inform, service_metrics, topic_message];
get_msg_containment("message_pb") -> [ai_event, activate_push, auth_reply, auth_request, data, deploy, efka_response, event, feedback_phase, ping, service_inform, service_metrics, service_params, topic_message];
get_msg_containment(P) -> error({gpb_error, {badproto, P}}).
@ -2999,8 +2999,8 @@ get_enum_containment(P) -> error({gpb_error, {badproto, P}}).
get_proto_by_msg_name_as_fqbin(<<"Data">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"ServiceParams">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"ServiceMetrics">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"ServiceArguments">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"Event">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message_pb";
get_proto_by_msg_name_as_fqbin(<<"AIEvent">>) -> "message_pb";

4
message_pb.proto
View File

@ -42,9 +42,9 @@ message TopicMessage {
}
// 服务参数
message ServiceArguments {
message ServiceParams {
string service_id = 1;
string args = 2;
string params = 2;
}
// 服务采集项