Merge pull request #7960 from bparees/flush

Merged by openshift-bot
openshift · Mar 12, 2016 · 2d2d659 · 2d2d659
2 parents 641cafc + 9478e43
commit 2d2d659
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/build/builder/docker.go b/pkg/build/builder/docker.go
@@ -105,6 +105,7 @@ func (d *DockerBuilder) Build() error {
 		glog.Warningf("Failed to remove temporary build tag %v: %v", buildTag, err)
 	}
 
+	defer glog.Flush()
 	if push {
 		// Get the Docker push authentication
 		pushAuthConfig, authPresent := dockercfg.NewHelper().GetDockerAuth(

diff --git a/pkg/build/builder/sti.go b/pkg/build/builder/sti.go
@@ -246,6 +246,7 @@ func (s *S2IBuilder) Build() error {
 		glog.Warningf("Failed to remove temporary build tag %v: %v", buildTag, err)
 	}
 
+	defer glog.Flush()
 	if push {
 		// Get the Docker push authentication
 		pushAuthConfig, authPresent := dockercfg.NewHelper().GetDockerAuth(
@@ -274,7 +275,6 @@ func (s *S2IBuilder) Build() error {
 			return errors.New(msg)
 		}
 		glog.Infof("Successfully pushed %s", pushTag)
-		glog.Flush()
 	}
 	return nil
 }