Merge pull request #4832 from LK4D4/fix_events_hanging_#4804

Workaround for hanging events. Fixes #4804
Upstream-commit: dece260f3aef2c98c95f3f06ff5ffbf1da3b1f39
Component: engine

components/engine/server/server.go

@@ -222,6 +222,10 @@ func (srv *Server) Events(job *engine.Job) engine.Status {
 
 	listener := make(chan utils.JSONMessage)
 	srv.Lock()
+	if old, ok := srv.listeners[from]; ok {
+		delete(srv.listeners, from)
+		close(old)
+	}
 	srv.listeners[from] = listener
 	srv.Unlock()
 	job.Stdout.Write(nil) // flush