diff --git a/apps/efka/src/efka_agent.erl b/apps/efka/src/efka_agent.erl index 467818a..1c45959 100644 --- a/apps/efka/src/efka_agent.erl +++ b/apps/efka/src/efka_agent.erl @@ -213,10 +213,10 @@ handle_info({auth_reply, {ok, ReplyBin}}, State = #state{status = ?STATE_AUTH, t lager:debug("[efka_agent] auth failed, message: ~p", [Message]), %% 上传缓冲区里面的所有数据 - CacheItems = micro_cache_model:get_all_cache(), + CacheItems = cache_model:get_all_cache(), lists:foreach(fun(#micro_cache{id = Id, method = Method, data = Packet}) -> efka_transport:send(TransportPid, Method, Packet), - micro_cache_model:delete(Id) + cache_model:delete(Id) end, CacheItems), {noreply, State#state{status = ?STATE_ACTIVATED}}; @@ -384,4 +384,4 @@ safe_response(_PacketId, _Reply, #state{}) -> safe_send(Method, Packet, #state{status = ?STATE_ACTIVATED, transport_pid = TransportPid}) when is_pid(TransportPid) -> efka_transport:send(TransportPid, Method, Packet); safe_send(Method, Packet, #state{}) -> - ok = micro_cache_model:insert(Method, Packet). \ No newline at end of file + ok = cache_model:insert(Method, Packet). \ No newline at end of file diff --git a/apps/efka/src/efka_app.erl b/apps/efka/src/efka_app.erl index ffeca1a..9f7f2a7 100644 --- a/apps/efka/src/efka_app.erl +++ b/apps/efka/src/efka_app.erl @@ -34,6 +34,6 @@ start_mnesia() -> lager:debug("[efka_app] tables: ~p", [Tables]), %% 创建数据库表 not lists:member(id_generator, Tables) andalso id_generator_model:create_table(), - not lists:member(micro_service, Tables) andalso micro_service_model:create_table(), + not lists:member(micro_service, Tables) andalso service_model:create_table(), not lists:member(micro_data, Tables) andalso micro_data_model:create_table(), ok. \ No newline at end of file diff --git a/apps/efka/src/efka_inetd_task.erl b/apps/efka/src/efka_inetd_task.erl index b3c72f2..a44ee54 100644 --- a/apps/efka/src/efka_inetd_task.erl +++ b/apps/efka/src/efka_inetd_task.erl @@ -95,7 +95,7 @@ handle_cast(deploy, State = #state{task_id = TaskId, root_dir = RootDir, service %% 创建lock文件 touch_lock(ServiceRootDir, TarUrl), %% 更新数据 - ok = micro_service_model:insert(#micro_service{ + ok = service_model:insert(#micro_service{ service_id = ServiceId, tar_url = TarUrl, %% 工作目录 diff --git a/apps/efka/src/efka_service.erl b/apps/efka/src/efka_service.erl index 535575b..1172567 100644 --- a/apps/efka/src/efka_service.erl +++ b/apps/efka/src/efka_service.erl @@ -110,7 +110,7 @@ start_link(Name, ServiceId) when is_atom(Name), is_binary(ServiceId) -> {ok, State :: #state{}} | {ok, State :: #state{}, timeout() | hibernate} | {stop, Reason :: term()} | ignore). init([ServiceId]) -> - case micro_service_model:get_service(ServiceId) of + case service_model:get_service(ServiceId) of error -> lager:notice("[efka_micro_service] service_id: ~p, not found", [ServiceId]), ignore; @@ -151,7 +151,7 @@ init0(#micro_service{service_id = ServiceId, status = 0}, Manifest) -> {stop, Reason :: term(), NewState :: #state{}}). %% 绑定channel handle_call({attach_channel, ChannelPid}, _From, State = #state{channel_pid = OldChannelPid, service_id = ServiceId}) -> - Status = micro_service_model:get_status(ServiceId), + Status = service_model:get_status(ServiceId), case {Status, is_pid(OldChannelPid) andalso is_process_alive(OldChannelPid)} of {1, false} -> erlang:monitor(process, ChannelPid), @@ -164,7 +164,7 @@ handle_call({attach_channel, ChannelPid}, _From, State = #state{channel_pid = Ol %% 请求参数项 done handle_call(request_config, _From, State = #state{service_id = ServiceId, running_status = ?STATUS_RUNNING}) -> - Params = micro_service_model:get_params(ServiceId), + Params = service_model:get_params(ServiceId), {reply, {ok, Params}, State}; %% 启动服务: 当前服务如果正常运行,则不允许重启 @@ -177,7 +177,7 @@ handle_call(start_service, _From, State = #state{running_status = ?STATUS_STOPPE {os_pid, OSPid} = erlang:port_info(Port, os_pid), lager:debug("start_service port: ~p, os_pid: ~p", [Port, OSPid]), %% 更新数据库状态 - ok = micro_service_model:change_status(ServiceId, 1), + ok = service_model:change_status(ServiceId, 1), {reply, ok, State#state{running_status = ?STATUS_RUNNING, port = Port, os_pid = OSPid}}; {error, Reason} -> %% 启动失败不能更新数据库里面的状态 @@ -195,7 +195,7 @@ handle_call(stop_service, _From, State = #state{running_status = ?STATUS_RUNNING erlang:is_port(Port) andalso erlang:port_close(Port), lager:debug("port: ~p, os_pid: ~p, will closed", [Port, OSPid]), - ok = micro_service_model:change_status(ServiceId, 0), + ok = service_model:change_status(ServiceId, 0), {reply, ok, State#state{port = undefined, os_pid = undefined, running_status = ?STATUS_STOPPED}}; @@ -242,7 +242,7 @@ handle_cast(_Request, State = #state{}) -> {stop, Reason :: term(), NewState :: #state{}}). %% 重启服务 handle_info({timeout, _, reboot_service}, State = #state{service_id = ServiceId, manifest = Manifest}) -> - case micro_service_model:get_status(ServiceId) of + case service_model:get_status(ServiceId) of 0 -> lager:debug("[efka_micro_service] service_id: ~p, is stopped, ignore boot_service", [ServiceId]), {noreply, State};