diff --git a/src/docker/docker_manager.erl b/src/docker/docker_manager.erl index 2c792ed..3461a43 100644 --- a/src/docker/docker_manager.erl +++ b/src/docker/docker_manager.erl @@ -142,7 +142,6 @@ handle_call({start_container, ContainerId}, _From, State) -> {reply, {error, Reason}, State} end; - %% 停止服务, 主动停止的时候会改变服务配置的status字段 handle_call({stop_container, ContainerId, TimeoutSeconds}, _From, State = #state{}) -> case docker_commands:stop_container(ContainerId, TimeoutSeconds) of diff --git a/src/efka_client.erl b/src/efka_client.erl index c16961c..78944b5 100644 --- a/src/efka_client.erl +++ b/src/efka_client.erl @@ -300,7 +300,7 @@ schedule_reconnect() -> -spec handle_container_request(message_pb:'ContainerRequest'()) -> ok. handle_container_request(#'ContainerRequest'{action = {list, #'ContainerRequest.List'{all = _All}}}) -> - case docker_manager:get_containers() of + case docker_commands:get_containers() of {ok, Containers} -> {ok, jiffy:encode(Containers, [force_utf8])}; {error, Reason} when is_binary(Reason) -> @@ -310,16 +310,16 @@ handle_container_request(#'ContainerRequest'{action = {deploy, #'ContainerReques docker_manager:deploy(TaskId, Params); handle_container_request(#'ContainerRequest'{action = {start, #'ContainerRequest.Start'{target = Target}}}) -> ContainerTarget = container_target(Target), - docker_manager:start_container(ContainerTarget); + docker_commands:start_container(ContainerTarget); handle_container_request(#'ContainerRequest'{action = {stop, #'ContainerRequest.Stop'{target = Target, timeout_seconds = TimeoutSeconds }}}) -> ContainerTarget = container_target(Target), - docker_manager:stop_container(ContainerTarget, TimeoutSeconds); + docker_commands:stop_container(ContainerTarget, TimeoutSeconds); handle_container_request(#'ContainerRequest'{action = {kill, #'ContainerRequest.Kill'{target = Target, signal = Signal}}}) -> ContainerTarget = container_target(Target), - docker_manager:kill_container(ContainerTarget, to_binary(Signal)); + docker_commands:kill_container(ContainerTarget, to_binary(Signal)); handle_container_request(#'ContainerRequest'{action = {remove, #'ContainerRequest.Remove'{target = Target, force = Force, remove_volumes = RemoveVolumes}}}) -> ContainerTarget = container_target(Target), - docker_manager:remove_container(ContainerTarget, to_bool(Force), to_bool(RemoveVolumes)); + docker_commands:remove_container(ContainerTarget, to_bool(Force), to_bool(RemoveVolumes)); handle_container_request(#'ContainerRequest'{action = {config, #'ContainerRequest.Config'{target = Target, config = Config}}}) -> ContainerTarget = container_target(Target), docker_manager:config_container(ContainerTarget, iolist_to_binary(Config)).