print app logs when fail to start or stop (#568)

Author: Cocossoul

cloudfoundry/managers/v3appdeployers/runbinder.go

@@ -222,7 +222,7 @@ func (r RunBinder) BindServiceInstances(appDeploy AppDeploy) ([]resources.Servic
 
 // WaitStart checks the state of each process instance
 func (r RunBinder) WaitStart(appDeploy AppDeploy) error {
-	return common.PollingWithTimeout(func() (bool, error) {
+	err := common.PollingWithTimeout(func() (bool, error) {
 		process, _, err := r.client.GetApplicationProcessByType(appDeploy.App.GUID, constant.ProcessTypeWeb)
 		if err != nil {
 			return true, err
@@ -250,6 +250,10 @@ func (r RunBinder) WaitStart(appDeploy AppDeploy) error {
 
 		return false, nil
 	}, 5*time.Second, appDeploy.StartTimeout)
+	if err != nil {
+		return r.processDeployErr(err, appDeploy)
+	}
+	return nil
 }
 
 func (r RunBinder) WaitStaging(appDeploy AppDeploy) error {
@@ -348,13 +352,13 @@ func (r RunBinder) Start(appDeploy AppDeploy) (resources.Application, resources.
 		}, 5*time.Second, appDeploy.StageTimeout)
 
 		if err != nil {
-			return resources.Application{}, resources.Process{}, err
+			return resources.Application{}, resources.Process{}, r.processDeployErr(err, appDeploy)
 		}
 
 		// Poll staged package
 		completedBuild, _, err := r.client.GetBuild(build.GUID)
 		if err != nil {
-			return resources.Application{}, resources.Process{}, err
+			return resources.Application{}, resources.Process{}, r.processDeployErr(err, appDeploy)
 		}
 		dropletGUID := completedBuild.DropletGUID
 
@@ -384,7 +388,7 @@ func (r RunBinder) Start(appDeploy AppDeploy) (resources.Application, resources.
 
 	scaledProcess, _, err := r.client.CreateApplicationProcessScale(appDeploy.App.GUID, processScaleInfo)
 	if err != nil {
-		return resources.Application{}, resources.Process{}, err
+		return resources.Application{}, resources.Process{}, r.processDeployErr(err, appDeploy)
 	}
 
 	// Process update info
@@ -397,7 +401,7 @@ func (r RunBinder) Start(appDeploy AppDeploy) (resources.Application, resources.
 		HealthCheckInvocationTimeout: appDeploy.Process.HealthCheckInvocationTimeout,
 	})
 	if err != nil {
-		return resources.Application{}, resources.Process{}, err
+		return resources.Application{}, resources.Process{}, r.processDeployErr(err, appDeploy)
 	}
 	// If command = null or "", the command field in updatedProcess will be the default generated by buildpack
 	// In that case, we don't set it in tfstate
@@ -408,12 +412,12 @@ func (r RunBinder) Start(appDeploy AppDeploy) (resources.Application, resources.
 	// Start application
 	_, _, err = r.client.UpdateApplicationStart(appDeploy.App.GUID)
 	if err != nil {
-		return resources.Application{}, resources.Process{}, err
+		return resources.Application{}, resources.Process{}, r.processDeployErr(err, appDeploy)
 	}
 
 	err = r.WaitStart(appDeploy)
 	if err != nil {
-		return resources.Application{}, resources.Process{}, r.processDeployErr(err, appDeploy)
+		return resources.Application{}, resources.Process{}, err
 	}
 
 	app, _, err := r.client.GetApplications(ccv3.Query{
@@ -430,7 +434,7 @@ func (r RunBinder) Start(appDeploy AppDeploy) (resources.Application, resources.
 func (r RunBinder) Stop(appDeploy AppDeploy) error {
 	_, _, err := r.client.UpdateApplicationStop(appDeploy.App.GUID)
 	if err != nil {
-		return err
+		return r.processDeployErr(err, appDeploy)
 	}
 
 	return nil
@@ -456,5 +460,5 @@ func (r RunBinder) processDeployErr(origErr error, appDeploy AppDeploy) error {
 	if err != nil {
 		logs = fmt.Sprintf("Error occurred when recolting app %s logs: %s", appDeploy.App.Name, err.Error())
 	}
-	return fmt.Errorf("%s\n\nApp '%s' logs: \n%s", origErr.Error(), appDeploy.App.Name, logs)
+	return fmt.Errorf("%s\n\nApp '%s' logs:\n%s", origErr.Error(), appDeploy.App.Name, logs)
 }