From 89563054ea6305c7270dcc6ab6fa5b286eb5f742 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 15 Dec 2017 22:48:35 +0100 Subject: Fixed xds-server folder events detection. Signed-off-by: Sebastien Douheret --- lib/agent/xdsserver.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'lib/agent/xdsserver.go') diff --git a/lib/agent/xdsserver.go b/lib/agent/xdsserver.go index 7020ef0..32656cf 100644 --- a/lib/agent/xdsserver.go +++ b/lib/agent/xdsserver.go @@ -307,10 +307,7 @@ func (xs *XdsServer) EventOn(evName string, privData interface{}, f EventCB) (uu // Register listener only the first time evn := evName - // FIXME: use generic type: data interface{} instead of data xsapiv1.EventMsg - var err error - if evName == "event:folder-state-change" { - err = xs.ioSock.On(evn, func(data xsapiv1.EventMsg) error { + err := xs.ioSock.On(evn, func(data interface{}) error { xs.sockEventsLock.Lock() sEvts := make([]*caller, len(xs.sockEvents[evn])) copy(sEvts, xs.sockEvents[evn]) @@ -320,18 +317,6 @@ func (xs *XdsServer) EventOn(evName string, privData interface{}, f EventCB) (uu } return nil }) - } else { - err = xs.ioSock.On(evn, func(data interface{}) error { - xs.sockEventsLock.Lock() - sEvts := make([]*caller, len(xs.sockEvents[evn])) - copy(sEvts, xs.sockEvents[evn]) - xs.sockEventsLock.Unlock() - for _, c := range sEvts { - c.Func(c.PrivateData, data) - } - return nil - }) - } if err != nil { return uuid.Nil, err } -- cgit 1.2.3-korg