Merge pull request #2049 from OffchainLabs/stop-execution-last

Stop execution node after everything else
OffchainLabs · Jan 5, 2024 · 8565937 · 8565937
2 parents 6ee273e + f23e24d
commit 8565937
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/arbnode/node.go b/arbnode/node.go
@@ -862,9 +862,6 @@ func (n *Node) Start(ctx context.Context) error {
 }
 
 func (n *Node) StopAndWait() {
-	if n.Execution != nil {
-		n.Execution.StopAndWait()
-	}
 	if n.MaintenanceRunner != nil && n.MaintenanceRunner.Started() {
 		n.MaintenanceRunner.StopAndWait()
 	}
@@ -917,7 +914,10 @@ func (n *Node) StopAndWait() {
 	if n.DASLifecycleManager != nil {
 		n.DASLifecycleManager.StopAndWaitUntil(2 * time.Second)
 	}
+	if n.Execution != nil {
+		n.Execution.StopAndWait()
+	}
 	if err := n.Stack.Close(); err != nil {
-		log.Error("error on stak close", "err", err)
+		log.Error("error on stack close", "err", err)
 	}
 }