fix(api): remove addSpawnInfo from loop (#5112)

ovh · Apr 7, 2020 · 2e8a66c · 2e8a66c
1 parent a64cb2f
commit 2e8a66c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/engine/api/workflow/dao.go b/engine/api/workflow/dao.go
@@ -1438,8 +1438,8 @@ func Push(ctx context.Context, db *gorp.DbMap, store cache.Store, proj *sdk.Proj
 			fromRepo = opts.FromRepository
 		}
 		envDB, msgList, err := environment.ParseAndImport(tx, *proj, env, environment.ImportOptions{Force: true, FromRepository: fromRepo}, decryptFunc, u)
-    allMsg = append(allMsg, msgList...)
-    if err != nil {
+		allMsg = append(allMsg, msgList...)
+		if err != nil {
 			return allMsg, nil, nil, sdk.ErrorWithFallback(err, sdk.ErrWrongRequest, "unable to import environment %s/%s", proj.Key, env.Name)
 		}
 		proj.SetEnvironment(*envDB)
@@ -1451,8 +1451,8 @@ func Push(ctx context.Context, db *gorp.DbMap, store cache.Store, proj *sdk.Proj
 			fromRepo = opts.FromRepository
 		}
 		pipDB, msgList, err := pipeline.ParseAndImport(ctx, tx, store, *proj, &pip, u, pipeline.ImportOptions{Force: true, FromRepository: fromRepo})
-    allMsg = append(allMsg, msgList...)
-    if err != nil {
+		allMsg = append(allMsg, msgList...)
+		if err != nil {
 			return allMsg, nil, nil, sdk.ErrorWithFallback(err, sdk.ErrWrongRequest, "unable to import pipeline %s/%s", proj.Key, pip.Name)
 		}
 		proj.SetPipeline(*pipDB)
@@ -1478,8 +1478,8 @@ func Push(ctx context.Context, db *gorp.DbMap, store cache.Store, proj *sdk.Proj
 	}
 
 	wf, msgList, err := ParseAndImport(ctx, tx, store, *proj, oldWf, data.Workflow, u, importOptions)
-  allMsg = append(allMsg, msgList...)
-  if err != nil {
+	allMsg = append(allMsg, msgList...)
+	if err != nil {
 		return allMsg, nil, nil, sdk.WrapError(err, "unable to import workflow %s", data.Workflow.GetName())
 	}
 

diff --git a/engine/api/workflow_run.go b/engine/api/workflow_run.go
@@ -1005,8 +1005,9 @@ func (api *API) initWorkflowRun(ctx context.Context, projKey string, wf *sdk.Wor
 						Args: msg.Args,
 						Type: msg.Type,
 					}
-					workflow.AddWorkflowRunInfo(wfRun, infos...)
+
 				}
+				workflow.AddWorkflowRunInfo(wfRun, infos...)
 				r1 := failInitWorkflowRun(ctx, api.mustDB(), wfRun, sdk.WrapError(err, "unable to get workflow from repository"))
 				report.Merge(ctx, r1)
 				return