Merge pull request #510 from ContainerSolutions/bug/logging-error-han…

…dling-image-pulling Added extra logging and exception handling when pulling images
ContainerSolutions · Oct 18, 2016 · 885408a · 885408a
2 parents acad919 + 5516025
commit 885408a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cli/src/main/java/com/containersol/minimesos/main/Main.java b/cli/src/main/java/com/containersol/minimesos/main/Main.java
@@ -113,7 +113,12 @@ public int run(String[] args) {
 
             return EXIT_CODE_OK;
         } catch (Exception ex) {
-            output.println("Failed to run command '" + jc.getParsedCommand() + "'. " + ex.getMessage());
+            if (ex.getMessage() != null) {
+                output.println("Failed to run command '" + jc.getParsedCommand() + "'. " + ex.getMessage());
+            } else {
+                output.println("Failed to run command '" + jc.getParsedCommand() + "'.");
+                ex.printStackTrace();
+            }
             LOGGER.debug("Exception while processing", ex);
             return EXIT_CODE_ERR;
         }

diff --git a/minimesos/src/main/java/com/containersol/minimesos/container/AbstractContainer.java b/minimesos/src/main/java/com/containersol/minimesos/container/AbstractContainer.java
@@ -219,6 +219,9 @@ public void remove() {
 
     protected Boolean imageExists(String imageName, String registryTag) {
         List<Image> images = DockerClientFactory.build().listImagesCmd().exec();
+        if (images.isEmpty()) {
+            throw new MinimesosException("Failed to find image '" +  imageName + ":" + registryTag + ". No images found");
+        }
         for (Image image : images) {
             for (String repoTag : image.getRepoTags()) {
                 if (repoTag.equals(imageName + ":" + registryTag)) {
@@ -230,6 +233,7 @@ protected Boolean imageExists(String imageName, String registryTag) {
     }
 
     protected void pullImage(String imageName, String registryTag) {
+        LOGGER.debug("Checking if image [" + imageName + ":" + registryTag + "] exists.");
 
         if (imageExists(imageName, registryTag)) {
             return;