Skip to content

Commit 55d20f1

Browse files
miltalexteo
authored andcommitted
[core] Report error of failed environment through stream
1 parent 71cb001 commit 55d20f1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

core/environment/manager.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,14 +464,18 @@ func (envs *Manager) CreateAutoEnvironment(workflowPath string, userVars map[str
464464
true ))
465465
if err != nil {
466466
envState := env.CurrentState()
467+
env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Error: err})
467468
log.WithField("state", envState).
468469
WithField("environment", env.Id().String()).
469470
WithError(err).
470471
Warn("environment deployment and configuration failed, cleanup in progress")
471472

472473
envTasks := env.Workflow().GetTasks()
473474
// TeardownEnvironment manages the envs.mu internally
474-
_ = envs.TeardownEnvironment(env.Id(), true/*force*/)
475+
err = envs.TeardownEnvironment(env.Id(), true/*force*/)
476+
if err != nil {
477+
env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Error: err})
478+
}
475479

476480
killedTasks, _, rlsErr := envs.taskman.KillTasks(envTasks.GetTaskIds())
477481
if rlsErr != nil {
@@ -482,7 +486,6 @@ func (envs *Manager) CreateAutoEnvironment(workflowPath string, userVars map[str
482486
"lastEnvState": envState,
483487
}).
484488
Warn("environment deployment failed, tasks were cleaned up")
485-
env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Error: err})
486489
return
487490
}
488491

0 commit comments

Comments
 (0)