Fix logging for backup pre-checks and actually running the backup

[#139271493] Signed-off-by: Rosie Bloxsom <[email protected]>
cloudfoundry · Mar 14, 2017 · 99bfbd3 · 99bfbd3
1 parent 3f7c374
commit 99bfbd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/integration/backup_test.go b/integration/backup_test.go
@@ -126,9 +126,10 @@ printf "backupcontent2" > $ARTIFACT_DIRECTORY/backupdump2
 				})
 
 				It("prints the backup progress to the screen", func() {
-					Expect(session.Out).To(gbytes.Say(fmt.Sprintf("INFO - Starting backup of %s...", deploymentName)))
+					Expect(session.Out).To(gbytes.Say(fmt.Sprintf("INFO - Running pre-checks for backup of %s...", deploymentName)))
 					Expect(session.Out).To(gbytes.Say("INFO - Scripts found:"))
 					Expect(session.Out).To(gbytes.Say("INFO - redis-dedicated-node/fake-uuid/redis/b-backup"))
+					Expect(session.Out).To(gbytes.Say(fmt.Sprintf("INFO - Starting backup of %s...", deploymentName)))
 					Expect(session.Out).To(gbytes.Say("INFO - Running pre-backup scripts..."))
 					Expect(session.Out).To(gbytes.Say("INFO - Done."))
 					Expect(session.Out).To(gbytes.Say("INFO - Running backup scripts..."))

diff --git a/orchestrator/backup_workflow.go b/orchestrator/backup_workflow.go
@@ -110,7 +110,7 @@ func (bw *backupWorkflow) Run() Error {
 }
 
 func (bw *backupWorkflow) checkDeployment(e *fsm.Event) {
-	bw.Logger.Info("", "Starting backup of %s...\n", bw.deploymentName)
+	bw.Logger.Info("", "Running pre-checks for backup of %s...\n", bw.deploymentName)
 
 	exists := bw.ArtifactManager.Exists(bw.deploymentName)
 	if exists {
@@ -149,6 +149,7 @@ func (bw *backupWorkflow) cleanup(e *fsm.Event) {
 }
 
 func (bw *backupWorkflow) createEmptyLocalArtifact(e *fsm.Event) {
+	bw.Logger.Info("", "Starting backup of %s...\n", bw.deploymentName)
 	var err error
 	bw.artifact, err = bw.ArtifactManager.Create(bw.deploymentName, bw.Logger)
 	if err != nil {