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

fix client

Browse Source
This commit is contained in:
anlicheng 2025-05-20 16:09:00 +08:00
parent 6386bc3dbf
commit 5787f797c3
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,4 +50,4 @@
-define(PUSH_SERVICE_CONFIG, 16#04). -define(PUSH_SERVICE_CONFIG, 16#04).
-define(PUSH_INVOKE, 16#05). -define(PUSH_INVOKE, 16#05).
-define(PUSH_TASK_LOG, 16#05). -define(PUSH_TASK_LOG, 16#06).

2
apps/efka/src/client/efka_client.erl
View File

@ -263,6 +263,8 @@ handle_info({tcp, Socket, <<?PACKET_PUSH, Packet/binary>>}, State = #state{socke
ControllerPid ! {invoke, self(), Ref, Payload}, ControllerPid ! {invoke, self(), Ref, Payload},
Reply = Reply =
receive receive
{invoke_reply, Ref, ok} ->
#{<<"id">> => Id, <<"result">> => <<"ok">>};
{invoke_reply, Ref, {ok, Result}} -> {invoke_reply, Ref, {ok, Result}} ->
#{<<"id">> => Id, <<"result">> => Result}; #{<<"id">> => Id, <<"result">> => Result};
{invoke_reply, Ref, {error, Reason}} when is_binary(Reason) -> {invoke_reply, Ref, {error, Reason}} when is_binary(Reason) ->

2
apps/efka/src/client/efka_client_broker.erl
View File

@ -82,7 +82,7 @@ handle_info({push_config, ReceiverPid, Ref, Config}, State = #state{}) ->
{noreply, State}; {noreply, State};
handle_info({invoke, ReceiverPid, Ref, Payload}, State = #state{}) -> handle_info({invoke, ReceiverPid, Ref, Payload}, State = #state{}) ->
lager:debug("[efka_client_broker] get invoke: ~p", [Payload]), lager:debug("[efka_client_broker] get invoke: ~p", [Payload]),
ReceiverPid ! {invoke_reply, Ref, ok}, ReceiverPid ! {invoke_reply, Ref, {ok, <<"yes invoke me">>}},
{noreply, State}. {noreply, State}.
%% @private %% @private

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

@ -299,6 +299,7 @@ handle_info({server_push, PacketId, <<?PUSH_INVOKE:8, InvokeBin/binary>>}, State
%% 处理task_log %% 处理task_log
handle_info({server_push, PacketId, <<?PUSH_TASK_LOG:8, TaskLogBin/binary>>}, State = #state{status = ?STATE_ACTIVATED}) -> handle_info({server_push, PacketId, <<?PUSH_TASK_LOG:8, TaskLogBin/binary>>}, State = #state{status = ?STATE_ACTIVATED}) ->
#fetch_task_log{task_id = TaskId} = message_pb:decode_msg(TaskLogBin, fetch_task_log), #fetch_task_log{task_id = TaskId} = message_pb:decode_msg(TaskLogBin, fetch_task_log),
lager:debug("[efka_agent] get task_log request: ~p", [TaskId]),
{ok, Logs} = efka_inetd_task_log:get_logs(TaskId), {ok, Logs} = efka_inetd_task_log:get_logs(TaskId),
Reply = case length(Logs) > 0 of Reply = case length(Logs) > 0 of
true -> true ->
@ -340,8 +341,8 @@ handle_info({service_reply, Ref, EmsReply}, State = #state{inflight = Inflight})
{noreply, State}; {noreply, State};
{PacketId, NInflight} -> {PacketId, NInflight} ->
Reply = case EmsReply of Reply = case EmsReply of
ok -> {ok, Result} ->
#async_call_reply{code = 1, message = <<"">>, result = <<>>}; #async_call_reply{code = 1, result = Result};
{error, Reason} -> {error, Reason} ->
#async_call_reply{code = 0, message = Reason} #async_call_reply{code = 0, message = Reason}
end, end,

2
apps/efka/src/efka_inetd_task.erl
View File

@ -114,7 +114,7 @@ code_change(_OldVsn, State = #state{}, _Extra) ->
do_deploy(TaskId, ServiceRootDir, ServiceId, TarUrl) when is_integer(TaskId), is_list(ServiceRootDir), is_binary(ServiceId), is_binary(TarUrl) -> do_deploy(TaskId, ServiceRootDir, ServiceId, TarUrl) when is_integer(TaskId), is_list(ServiceRootDir), is_binary(ServiceId), is_binary(TarUrl) ->
case download(binary_to_list(TarUrl), ServiceRootDir) of case download(binary_to_list(TarUrl), ServiceRootDir) of
{ok, TarFile, CostTs} -> {ok, TarFile, CostTs} ->
Log = io_lib:format("[efka_inetd_task] download: ~p completed, cost time: ~p(ms)", [binary_to_list(TarUrl), CostTs]), Log = io_lib:format("download: ~p completed, cost time: ~p(ms)", [binary_to_list(TarUrl), CostTs]),
efka_inetd_task_log:stash(TaskId, list_to_binary(Log)), efka_inetd_task_log:stash(TaskId, list_to_binary(Log)),
%% 创建工作目录 %% 创建工作目录

2
apps/efka/src/efka_inetd_task_log.erl
View File

@ -35,7 +35,7 @@ stash(TaskId, Log) when is_integer(TaskId), is_binary(Log) ->
stash(TaskId, Items) when is_integer(TaskId), is_list(Items) -> stash(TaskId, Items) when is_integer(TaskId), is_list(Items) ->
{{Y, M, D}, {H, I, S}} = calendar:local_time(), {{Y, M, D}, {H, I, S}} = calendar:local_time(),
TimePrefix = iolist_to_binary(io_lib:format("[~b-~2..0b-~2..0b ~2..0b:~2..0b:~2..0b]", [Y, M, D, H, I, S])), TimePrefix = iolist_to_binary(io_lib:format("[~b-~2..0b-~2..0b ~2..0b:~2..0b:~2..0b]", [Y, M, D, H, I, S])),
Log = iolist_to_binary([TimePrefix, <<" ">>, lists:join(<<" ">>, Items), <<$\n>>]), Log = iolist_to_binary([TimePrefix, <<" ">>, lists:join(<<" ">>, Items)]),
gen_server:cast(?SERVER, {stash, TaskId, Log}). gen_server:cast(?SERVER, {stash, TaskId, Log}).
-spec flush(TaskId :: integer()) -> no_return(). -spec flush(TaskId :: integer()) -> no_return().