X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fapiv1-version.go;h=be726724916a069b6c65fd125c2548fb7bb5872b;hb=cd8d64e86de540aea78a253c5fcc7826e8f15456;hp=c75e7f5da68714590f8928ed54fcd7bcc7070b8b;hpb=be13167b869161b6e19dc3e94835245cdc7911e5;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/agent/apiv1-version.go b/lib/agent/apiv1-version.go index c75e7f5..be72672 100644 --- a/lib/agent/apiv1-version.go +++ b/lib/agent/apiv1-version.go @@ -1,17 +1,17 @@ package agent import ( + "fmt" "net/http" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/apiv1" - common "github.com/iotbzh/xds-common/golib" + "github.com/iotbzh/xds-agent/lib/xaapiv1" ) // getInfo : return various information about server func (s *APIService) getVersion(c *gin.Context) { - response := apiv1.XDSVersion{ - Client: apiv1.VersionData{ + response := xaapiv1.XDSVersion{ + Client: xaapiv1.VersionData{ ID: "", Version: s.Config.Version, APIVersion: s.Config.APIVersion, @@ -19,12 +19,14 @@ func (s *APIService) getVersion(c *gin.Context) { }, } - svrVer := []apiv1.VersionData{} + svrVer := []xaapiv1.VersionData{} for _, svr := range s.xdsServers { - res := apiv1.VersionData{} + res := xaapiv1.VersionData{} if err := svr.GetVersion(&res); err != nil { - common.APIError(c, "Cannot retrieve version of XDS server ID %s : %v", svr.ID, err.Error()) - return + errMsg := fmt.Sprintf("Cannot retrieve version of XDS server ID %s : %v", svr.ID, err.Error()) + s.Log.Warning(errMsg) + res.ID = svr.ID + res.Version = errMsg } svrVer = append(svrVer, res) }