Repository: aries-containers Updated Branches: refs/heads/master 710c96a7f -> d6d8175cc
Support killing an individual container. Project: http://git-wip-us.apache.org/repos/asf/aries-containers/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-containers/commit/d6d8175c Tree: http://git-wip-us.apache.org/repos/asf/aries-containers/tree/d6d8175c Diff: http://git-wip-us.apache.org/repos/asf/aries-containers/diff/d6d8175c Branch: refs/heads/master Commit: d6d8175cc09df59922be8a89f38b539548aaadc6 Parents: 710c96a Author: David Bosschaert <[email protected]> Authored: Fri May 26 09:58:43 2017 +0100 Committer: David Bosschaert <[email protected]> Committed: Fri May 26 09:58:43 2017 +0100 ---------------------------------------------------------------------- .../aries/containers/docker/local/impl/ContainerImpl.java | 6 +++++- .../aries/containers/docker/local/impl/ServiceImpl.java | 7 ++----- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-containers/blob/d6d8175c/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java ---------------------------------------------------------------------- diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java index 4895433..b092d60 100644 --- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java +++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java @@ -39,7 +39,11 @@ public class ContainerImpl implements Container { @Override public void destroy() { - service.killAndReplaceContainer(this); + try { + service.killContainer(this); + } catch (Exception e) { + LocalDockerContainerFactory.LOG.warn("Problem killing container {}", this, e); + } } @Override http://git-wip-us.apache.org/repos/asf/aries-containers/blob/d6d8175c/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java index f852f00..cace802 100644 --- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java +++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java @@ -76,12 +76,9 @@ public class ServiceImpl implements Service { } } - private void killContainer(ContainerImpl container) throws Exception { + void killContainer(ContainerImpl container) throws Exception { factory.destroyDockerContainer(container.getID(), true); - } - - public void killAndReplaceContainer(ContainerImpl containerImpl) { - // TODO implement + containers.remove(container); } @Override
