Consolidate startup logic

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
hyperledger · Aug 16, 2021 · ba1b68e · ba1b68e
1 parent ffe55c2
commit ba1b68e
Showing 1 changed file with 19 additions and 26 deletions.
diff --git a/internal/stacks/stack_manager.go b/internal/stacks/stack_manager.go
@@ -314,28 +314,30 @@ func (s *StackManager) StartStack(fancyFeatures bool, verbose bool, options *Sta
 
 		return nil
 	} else if err == nil {
+		return s.runStartupSequence(workingDir, verbose)
+	} else {
+		return err
+	}
+}
 
-		if err := s.blockchainProvider.PreStart(); err != nil {
-			return err
-		}
-
-		s.Log.Info("starting FireFly dependencies")
-		if err := docker.RunDockerComposeCommand(workingDir, verbose, verbose, "up", "-d"); err != nil {
-			return err
-		}
-
-		if err := s.blockchainProvider.PostStart(); err != nil {
-			return err
-		}
+func (s *StackManager) runStartupSequence(workingDir string, verbose bool) error {
+	if err := s.blockchainProvider.PreStart(); err != nil {
+		return err
+	}
 
-		if err := s.ensureFireflyNodesUp(false); err != nil {
-			return err
-		}
+	s.Log.Info("starting FireFly dependencies")
+	if err := docker.RunDockerComposeCommand(workingDir, verbose, verbose, "up", "-d"); err != nil {
+		return err
+	}
 
+	if err := s.blockchainProvider.PostStart(); err != nil {
 		return err
-	} else {
+	}
+
+	if err := s.ensureFireflyNodesUp(false); err != nil {
 		return err
 	}
+	return nil
 }
 
 func (s *StackManager) StopStack(verbose bool) error {
@@ -454,16 +456,7 @@ func (s *StackManager) runFirstTimeSetup(verbose bool, options *StartOptions) er
 		}
 	}
 
-	s.Log.Info("starting FireFly dependencies")
-	if err := docker.RunDockerComposeCommand(workingDir, verbose, verbose, "up", "-d"); err != nil {
-		return err
-	}
-
-	if err := s.blockchainProvider.PostStart(); err != nil {
-		return err
-	}
-
-	if err := s.ensureFireflyNodesUp(true); err != nil {
+	if err := s.runStartupSequence(workingDir, verbose); err != nil {
 		return err
 	}