Merge pull request #47 from palantir/feature/better-docker-compose-ex…

…ecution-exeception-message Put `docker-compose` output directly into exception message
palantir · Apr 8, 2016 · 36d3038 · 36d3038
2 parents 1357e92 + 9f9b1bc
commit 36d3038
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java b/src/main/java/com/palantir/docker/compose/execution/DefaultDockerCompose.java
@@ -118,10 +118,10 @@ public Ports ports(String service) throws IOException, InterruptedException {
 
     private ErrorHandler throwingOnError() {
         return (exitCode, output, commands) -> {
-            log.warn(constructNonZeroExitErrorMessage(exitCode, commands));
-            log.warn("The output was:");
-            log.warn(output);
-            throw new DockerComposeExecutionException(constructNonZeroExitErrorMessage(exitCode, commands));
+            String message = constructNonZeroExitErrorMessage(exitCode, commands) + "\n"
+                + "The output was:\n"
+                + output;
+            throw new DockerComposeExecutionException(message);
         };
     }