From 02aec942b44eecd2ea9b311bb4ba2d60cce21e9a Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Wed, 8 Nov 2017 10:19:54 +0100 Subject: Fixed events definition and callback processing. --- lib/agent/project-st.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/agent/project-st.go') diff --git a/lib/agent/project-st.go b/lib/agent/project-st.go index dba5978..cd55656 100644 --- a/lib/agent/project-st.go +++ b/lib/agent/project-st.go @@ -85,7 +85,7 @@ func (p *STProject) UpdateProject(prj apiv1.ProjectConfig) (*apiv1.ProjectConfig // Register events to update folder status // Register to XDS Server events - p.server.EventOn("event:FolderStateChanged", p._cbServerFolderChanged) + p.server.EventOn("event:FolderStateChanged", "", p._cbServerFolderChanged) if err := p.server.EventRegister("FolderStateChanged", svrPrj.ID); err != nil { p.Log.Warningf("XDS Server EventRegister failed: %v", err) return svrPrj, err @@ -128,12 +128,12 @@ func (p *STProject) IsInSync() (bool, error) { // callback use to update (XDS Server) folder IsInSync status -func (p *STProject) _cbServerFolderChanged(data interface{}) { +func (p *STProject) _cbServerFolderChanged(pData interface{}, data interface{}) error { evt := data.(XdsEventFolderChange) // Only process event that concerns this project/folder ID if p.folder.ID != evt.Folder.ID { - return + return nil } if evt.Folder.IsInSync != p.folder.DataCloudSync.STSvrIsInSync || @@ -146,6 +146,7 @@ func (p *STProject) _cbServerFolderChanged(data interface{}) { p.Log.Warningf("Cannot notify project change: %v", err) } } + return nil } // callback use to update IsInSync status -- cgit 1.2.3-korg