Improve behaviour in case of ComposeUp failure (#123)

* Fix NullPointerException when ComposeUp task fails When the ComposeUp task fails, it tries to invoke the ComposeDown task. This lead to a "java.lang.NullPointerException: Cannot invoke method down() on null object" error due to an incorrect assignment order. * Display correct health status when waitForHealthStateTimeout is exceeded The health state was hard coded as 'starting', but it might also be 'unhealthy'.
avast · Nov 13, 2017 · cb0bc53 · cb0bc53
1 parent c1818f0
commit cb0bc53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy
@@ -57,11 +57,11 @@ class ComposeSettings {
 
         upTask = project.tasks.create(name ? "${name}ComposeUp" : 'composeUp', ComposeUp)
         upTask.settings = this
-        upTask.downTask = downTask
         pullTask = project.tasks.create(name ? "${name}ComposePull" : 'composePull', ComposePull)
         pullTask.settings = this
         downTask = project.tasks.create(name ? "${name}ComposeDown" : 'composeDown', ComposeDown)
         downTask.settings = this
+        upTask.downTask = downTask
 
         this.dockerExecutor = new DockerExecutor(this)
         this.composeExecutor = new ComposeExecutor(this)

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeUp.groovy b/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeUp.groovy
@@ -101,8 +101,9 @@ class ComposeUp extends DefaultTask {
             serviceInfo.containerInfos.each { instanceName, containerInfo ->
                 while (true) {
                     Map<String, Object> inspectionState = settings.dockerExecutor.getInspection(containerInfo.containerId).State
+                    String healthStatus = 'undefined'
                     if (inspectionState.containsKey('Health')) {
-                        String healthStatus = inspectionState.Health.Status
+                        healthStatus = inspectionState.Health.Status
                         if (!"starting".equalsIgnoreCase(healthStatus) && !"unhealthy".equalsIgnoreCase(healthStatus)) {
                             logger.lifecycle("${instanceName} health state reported as '$healthStatus' - continuing...")
                             return
@@ -114,7 +115,7 @@ class ComposeUp extends DefaultTask {
                         return
                     }
                     if (start.plus(settings.waitForHealthyStateTimeout) < Instant.now()) {
-                        throw new RuntimeException("Container ${containerInfo.containerId} of service ${instanceName} is still reported as 'starting'. Logs:${System.lineSeparator()}${settings.getContainerLogs(containerInfo.containerId)}")
+                        throw new RuntimeException("Container ${containerInfo.containerId} of service ${instanceName} is still reported as '${healthStatus}'. Logs:${System.lineSeparator()}${settings.dockerExecutor.getContainerLogs(containerInfo.containerId)}")
                     }
                 }
             }