[core] Fix hanging force shutdown

miltalex · teo · commit dbab4925dfc4 · 2020-11-24T13:08:54.000+01:00
diff --git a/core/environment/environment.go b/core/environment/environment.go
@@ -400,9 +400,11 @@ func (env *Environment) subscribeToWfState(taskman *task.Manager) {
 						taskman.MessageChannel <- taskmanMessage
 						<-env.stateChangedCh
 						}
+						env.unsubscribe = nil
 						break WORKFLOW_STATE_LOOP
 					}
 					if wfState == task.DONE {
+						env.unsubscribe = nil
 						break WORKFLOW_STATE_LOOP
 					}
 				case <- env.unsubscribe:

Original file line number	Diff line number	Diff line change
`@@ -400,9 +400,11 @@ func (env Environment) subscribeToWfState(taskman task.Manager) {`
`400`	`400`	`taskman.MessageChannel <- taskmanMessage`
`401`	`401`	`<-env.stateChangedCh`
`402`	`402`	`}`
	`403`	`+ env.unsubscribe = nil`
`403`	`404`	`break WORKFLOW_STATE_LOOP`
`404`	`405`	`}`
`405`	`406`	`if wfState == task.DONE {`
	`407`	`+ env.unsubscribe = nil`
`406`	`408`	`break WORKFLOW_STATE_LOOP`
`407`	`409`	`}`
`408`	`410`	`case <- env.unsubscribe:`