fix defer

RunLLM · Feb 1, 2023 · 2eef267 · 2eef267
1 parent 3c0bcc1
commit 2eef267
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/src/golang/lib/engine/aq_engine.go b/src/golang/lib/engine/aq_engine.go
@@ -841,6 +841,7 @@ func onFinishExecution(
 	integrationRepo repos.Integration,
 	DB database.Database,
 ) {
+	// Wait a little bit for all active operators to finish before exiting on failure.
 	waitForInProgressOperators(ctx, inProgressOps, pollInterval, cleanupTimeout)
 	if curErr != nil && notificationContent == nil {
 		notificationContent = &notificationContentStruct{
@@ -849,6 +850,7 @@ func onFinishExecution(
 		}
 	}
 
+	// Send notifications
 	if notificationContent != nil && execMode == operator.Publish {
 		err := sendNotifications(
 			ctx,
@@ -892,20 +894,21 @@ func (eng *aqEngine) execute(
 		return errors.Newf("No initial operators to schedule.")
 	}
 
-	// Wait a little bit for all active operators to finish before exiting on failure.
-	defer onFinishExecution(
-		ctx,
-		inProgressOps,
-		timeConfig.OperatorPollInterval,
-		timeConfig.CleanupTimeout,
-		err,
-		notificationContent,
-		workflowDag,
-		opExecMode,
-		vaultObject,
-		eng.IntegrationRepo,
-		eng.Database,
-	)
+	defer func() {
+		onFinishExecution(
+			ctx,
+			inProgressOps,
+			timeConfig.OperatorPollInterval,
+			timeConfig.CleanupTimeout,
+			err,
+			notificationContent,
+			workflowDag,
+			opExecMode,
+			vaultObject,
+			eng.IntegrationRepo,
+			eng.Database,
+		)
+	}()
 
 	start := time.Now()
 

diff --git a/src/golang/lib/engine/databricks_executor.go b/src/golang/lib/engine/databricks_executor.go
@@ -65,20 +65,21 @@ func ExecuteDatabricks(
 		return errors.Newf("No initial operators to schedule.")
 	}
 
-	// Wait a little bit for all active operators to finish before exiting on failure.
-	defer onFinishExecution(
-		ctx,
-		inProgressOps,
-		timeConfig.OperatorPollInterval,
-		timeConfig.CleanupTimeout,
-		err,
-		notificationContent,
-		dag,
-		opExecMode,
-		vaultObject,
-		integrationRepo,
-		DB,
-	)
+	defer func() {
+		onFinishExecution(
+			ctx,
+			inProgressOps,
+			timeConfig.OperatorPollInterval,
+			timeConfig.CleanupTimeout,
+			err,
+			notificationContent,
+			dag,
+			opExecMode,
+			vaultObject,
+			integrationRepo,
+			DB,
+		)
+	}()
 
 	start := time.Now()
 	var operatorError error