X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fprojects.go;h=6804d35e19523cc06159a6a9eee177533997ebdb;hb=be13167b869161b6e19dc3e94835245cdc7911e5;hp=39c120f4cccb1784306ad8971f1a423d5752eeb1;hpb=97ca1f277dc8b6973d6fa67add5593a9c395ce60;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/projects.go b/lib/agent/projects.go index 39c120f..6804d35 100644 --- a/lib/agent/projects.go +++ b/lib/agent/projects.go @@ -5,6 +5,7 @@ import ( "log" "time" + "github.com/iotbzh/xds-agent/lib/apiv1" "github.com/iotbzh/xds-agent/lib/syncthing" "github.com/syncthing/syncthing/lib/sync" ) @@ -14,16 +15,8 @@ type Projects struct { *Context SThg *st.SyncThing projects map[string]*IPROJECT - //SEB registerCB []RegisteredCB } -/* SEB -type RegisteredCB struct { - cb *EventCB - data *EventCBData -} -*/ - // Mutex to make add/delete atomic var pjMutex = sync.NewMutex() @@ -33,7 +26,6 @@ func NewProjects(ctx *Context, st *st.SyncThing) *Projects { Context: ctx, SThg: st, projects: make(map[string]*IPROJECT), - //registerCB: []RegisteredCB{}, } } @@ -51,26 +43,19 @@ func (p *Projects) Init(server *XdsServer) error { if svr.Disabled { continue } - xFlds := []FolderConfig{} - if err := svr.HTTPGet("/folders", &xFlds); err != nil { + xFlds := []XdsFolderConfig{} + if err := svr.GetFolders(&xFlds); err != nil { errMsg += fmt.Sprintf("Cannot retrieve folders config of XDS server ID %s : %v \n", svr.ID, err.Error()) continue } - p.Log.Debugf("Server %s, %d projects detected", svr.ID[:8], len(xFlds)) + p.Log.Debugf("Connected to XDS Server %s, %d projects detected", svr.ID, len(xFlds)) for _, prj := range xFlds { newP := svr.FolderToProject(prj) - if /*nPrj*/ _, err := p.createUpdate(newP, false, true); err != nil { + if _, err := p.createUpdate(newP, false, true); err != nil { errMsg += "Error while creating project id " + prj.ID + ": " + err.Error() + "\n " continue } - - /* FIXME emit EVTProjectChange event ? - if err := p.events.Emit(EVTProjectChange, *nPrj); err != nil { - p.Log.Warningf("Cannot notify project change: %v", err) - } - */ } - } p.Log.Infof("Number of loaded Projects: %d", len(p.projects)) @@ -94,7 +79,7 @@ func (p *Projects) Get(id string) *IPROJECT { } // GetProjectArr returns the config of all folders as an array -func (p *Projects) GetProjectArr() []ProjectConfig { +func (p *Projects) GetProjectArr() []apiv1.ProjectConfig { pjMutex.Lock() defer pjMutex.Unlock() @@ -102,8 +87,8 @@ func (p *Projects) GetProjectArr() []ProjectConfig { } // GetProjectArrUnsafe Same as GetProjectArr without mutex protection -func (p *Projects) GetProjectArrUnsafe() []ProjectConfig { - conf := []ProjectConfig{} +func (p *Projects) GetProjectArrUnsafe() []apiv1.ProjectConfig { + conf := []apiv1.ProjectConfig{} for _, v := range p.projects { prj := (*v).GetProject() conf = append(conf, *prj) @@ -112,14 +97,14 @@ func (p *Projects) GetProjectArrUnsafe() []ProjectConfig { } // Add adds a new folder -func (p *Projects) Add(newF ProjectConfig) (*ProjectConfig, error) { +func (p *Projects) Add(newF apiv1.ProjectConfig) (*apiv1.ProjectConfig, error) { prj, err := p.createUpdate(newF, true, false) if err != nil { return prj, err } // Notify client with event - if err := p.events.Emit(EVTProjectAdd, *prj); err != nil { + if err := p.events.Emit(apiv1.EVTProjectAdd, *prj); err != nil { p.Log.Warningf("Cannot notify project deletion: %v", err) } @@ -127,7 +112,7 @@ func (p *Projects) Add(newF ProjectConfig) (*ProjectConfig, error) { } // CreateUpdate creates or update a folder -func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) (*ProjectConfig, error) { +func (p *Projects) createUpdate(newF apiv1.ProjectConfig, create bool, initial bool) (*apiv1.ProjectConfig, error) { var err error pjMutex.Lock() @@ -159,32 +144,35 @@ func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) ( var fld IPROJECT switch newF.Type { // SYNCTHING - case TypeCloudSync: + case apiv1.TypeCloudSync: if p.SThg != nil { - /*SEB fld = f.SThg.NewFolderST(f.Conf)*/ fld = NewProjectST(p.Context, svr) } else { return nil, fmt.Errorf("Cloud Sync project not supported") } // PATH MAP - case TypePathMap: + case apiv1.TypePathMap: fld = NewProjectPathMap(p.Context, svr) default: return nil, fmt.Errorf("Unsupported folder type") } - var newPrj *ProjectConfig + var newPrj *apiv1.ProjectConfig if create { // Add project on server if newPrj, err = fld.Add(newF); err != nil { - newF.Status = StatusErrorConfig - log.Printf("ERROR Adding folder: %v\n", err) + newF.Status = apiv1.StatusErrorConfig + log.Printf("ERROR Adding project: %v\n", err) return newPrj, err } } else { // Just update project config - newPrj = fld.SetProject(newF) + if newPrj, err = fld.UpdateProject(newF); err != nil { + newF.Status = apiv1.StatusErrorConfig + log.Printf("ERROR Updating project: %v\n", err) + return newPrj, err + } } // Sanity check @@ -207,13 +195,13 @@ func (p *Projects) createUpdate(newF ProjectConfig, create bool, initial bool) ( } // Delete deletes a specific folder -func (p *Projects) Delete(id string) (ProjectConfig, error) { +func (p *Projects) Delete(id string) (apiv1.ProjectConfig, error) { var err error pjMutex.Lock() defer pjMutex.Unlock() - fld := ProjectConfig{} + fld := apiv1.ProjectConfig{} fc, exist := p.projects[id] if !exist { return fld, fmt.Errorf("unknown id") @@ -228,7 +216,7 @@ func (p *Projects) Delete(id string) (ProjectConfig, error) { delete(p.projects, id) // Notify client with event - if err := p.events.Emit(EVTProjectDelete, *prj); err != nil { + if err := p.events.Emit(apiv1.EVTProjectDelete, *prj); err != nil { p.Log.Warningf("Cannot notify project deletion: %v", err) }