Merge pull request #406 from ContainerSolutions/bug/379-npe-on-exception

fixes #379. NPE in Main on exception
ContainerSolutions · Apr 21, 2016 · f43576a · f43576a
2 parents de76c35 + f106be1
commit f43576a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/minimesos/src/main/java/com/containersol/minimesos/container/AbstractContainer.java b/minimesos/src/main/java/com/containersol/minimesos/container/AbstractContainer.java
@@ -116,7 +116,7 @@ public void start(int timeout) {
             throw new MinimesosException(errorMessage + " See container logs above");
         }
 
-        LOGGER.debug("Container is up and running");
+        LOGGER.debug(String.format("Container %s is up and running", containerId));
     }
 
     /**

diff --git a/minimesos/src/main/java/com/containersol/minimesos/main/Main.java b/minimesos/src/main/java/com/containersol/minimesos/main/Main.java
@@ -31,7 +31,7 @@ public class Main {
     private boolean help = false;
 
     @Parameter(names = "--debug", description = "Enable debug logging.")
-    private Boolean debug = null;
+    private boolean debug = false;
 
     private PrintStream output = System.out;
 
@@ -91,7 +91,7 @@ public int run(String[] args) {
             return EXIT_CODE_OK;
         }
 
-        if (debug != null) {
+        if (debug) {
             LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
             ch.qos.logback.classic.Logger rootLogger = loggerContext.getLogger("com.containersol.minimesos.container");
             rootLogger.setLevel(Level.DEBUG);
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,7 +116,7 @@ public void start(int timeout) { @@
                 throw new MinimesosException(errorMessage + " See container logs above");
             }
-            LOGGER.debug("Container is up and running");
+            LOGGER.debug(String.format("Container %s is up and running", containerId));
         }
         /**
@@ Expand Down @@