X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fprojects.go;h=4e8b0f629fb991b657a55563ff2d936ce06af227;hb=f1083a8259b3d2f560b5f3ccb8b47c94e297d7fa;hp=a2d8fe123fc36f9c8caa1979322f9979c6153456;hpb=d0d64817590d38d182faeb0e040861d3d3cb9f3b;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/projects.go b/lib/agent/projects.go index a2d8fe1..4e8b0f6 100644 --- a/lib/agent/projects.go +++ b/lib/agent/projects.go @@ -54,6 +54,7 @@ func NewProjects(ctx *Context, st *st.SyncThing) *Projects { // Init Load Projects configuration func (p *Projects) Init(server *XdsServer) error { + svrList := make(map[string]*XdsServer) // If server not set, load for all servers if server == nil { @@ -75,6 +76,11 @@ func (p *Projects) Init(server *XdsServer) error { for _, prj := range xFlds { newP := svr.FolderToProject(prj) if _, err := p.createUpdate(newP, false, true); err != nil { + // Don't consider that as an error (allow support config without CloudSync support) + if p.Context.SThg == nil && strings.Contains(err.Error(), "Server doesn't support project type CloudSync") { + continue + } + errMsg += "Error while creating project id " + prj.ID + ": " + err.Error() + "\n " continue } @@ -246,14 +252,12 @@ func (p *Projects) createUpdate(newF xaapiv1.ProjectConfig, create bool, initial // Add to folders list p.projects[newPrj.ID] = &fld - // Force sync after creation + // Force sync to get an initial sync status // (need to defer to be sure that WS events will arrive after HTTP creation reply) - if create { - go func() { - time.Sleep(time.Millisecond * 500) - fld.Sync() - }() - } + go func() { + time.Sleep(time.Millisecond * 500) + fld.Sync() + }() return newPrj, nil }