From e3fcde693468f598e5ebfae16251286842e3291c Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Thu, 20 Jul 2017 14:56:00 +0200
Subject: [PATCH] Fix deadlock in events service

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 events/emitter.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/events/emitter.go b/events/emitter.go
index ed3902146..d69105647 100644
--- a/events/emitter.go
+++ b/events/emitter.go
@@ -47,7 +47,9 @@ func (e *Emitter) Events(ctx context.Context, clientID string) chan *events.Enve
 			ns: ns,
 		}
 		e.sinks[clientID] = s
+		e.m.Unlock()
 		e.broadcaster.Add(s)
+		return s.ch
 	}
 	ch := e.sinks[clientID].ch
 	e.m.Unlock()