[core] Report teardown complete at the end of operation

miltalex · teo · commit dd7b07eaff25 · 2021-05-06T11:20:42.000+02:00
diff --git a/core/environment/manager.go b/core/environment/manager.go
@@ -252,7 +252,6 @@ func (envs *Manager) TeardownEnvironment(environmentId uid.ID, force bool) error
 			len(taskReleaseErrors), environmentId)
 		return err
 	}
-	env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Message: "teardown complete", State: "DONE"})
 
 	envs.mu.Unlock()
 	// we trigger all cleanup hooks
@@ -293,6 +292,7 @@ func (envs *Manager) TeardownEnvironment(environmentId uid.ID, force bool) error
 		return err
 	}
 
+	env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Message: "teardown complete", State: "DONE"})
 	delete(envs.m, environmentId)
 	env.unsubscribeFromWfState()
 	return err

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,6 @@ func (envs *Manager) TeardownEnvironment(environmentId uid.ID, force bool) error`
`252`	`252`	`len(taskReleaseErrors), environmentId)`
`253`	`253`	`return err`
`254`	`254`	`}`
`255`		`- env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Message: "teardown complete", State: "DONE"})`
`256`	`255`
`257`	`256`	`envs.mu.Unlock()`
`258`	`257`	`// we trigger all cleanup hooks`
`@@ -293,6 +292,7 @@ func (envs *Manager) TeardownEnvironment(environmentId uid.ID, force bool) error`
`293`	`292`	`return err`
`294`	`293`	`}`
`295`	`294`
	`295`	`+ env.sendEnvironmentEvent(&event.EnvironmentEvent{EnvironmentID: env.Id().String(), Message: "teardown complete", State: "DONE"})`
`296`	`296`	`delete(envs.m, environmentId)`
`297`	`297`	`env.unsubscribeFromWfState()`
`298`	`298`	`return err`