Merge pull request #511 from vania-pooh/master

Fixed NPE in logs capturing logic (fixes #510)
aerokube · Jul 27, 2018 · 70c7afa · 70c7afa
2 parents bd29e70 + 1a46342
commit 70c7afa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/service/docker.go b/service/docker.go
@@ -159,11 +159,11 @@ func (d *Docker) StartWithCancel() (*StartedService, error) {
 					ShowStdout: true,
 					ShowStderr: true,
 				})
-				defer r.Close()
 				if err != nil {
 					log.Printf("[%d] [FAILED_TO_COPY_LOGS] [%s] [Failed to capture container logs: %v]", requestId, browserContainerId, err)
 					return
 				}
+				defer r.Close()
 				filename := filepath.Join(d.LogOutputDir, d.LogName)
 				f, err := os.Create(filename)
 				if err != nil {