Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use go module as dependency tool instead of glide
[src/xds/xds-agent.git]
/
lib
/
agent
/
apiv1-config.go
diff --git
a/lib/agent/apiv1-config.go
b/lib/agent/apiv1-config.go
index
bd4da33
..
543a5e1
100644
(file)
--- a/
lib/agent/apiv1-config.go
+++ b/
lib/agent/apiv1-config.go
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017
-2018
"IoT.bzh"
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-21,10
+21,10
@@
import (
"net/http"
"sync"
"net/http"
"sync"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin"
- "github.com/iotbzh/xds-agent/lib/xaapiv1"
- "github.com/iotbzh/xds-agent/lib/xdsconfig"
- common "github.com/iotbzh/xds-common/golib"
)
var confMut sync.Mutex
)
var confMut sync.Mutex
@@
-66,8
+66,11
@@
func (s *APIService) setConfig(c *gin.Context) {
}
}
}
}
- // Add new XDS Server
+ // Add new
/ unconnected
XDS Server
for _, svr := range cfgArg.Servers {
for _, svr := range cfgArg.Servers {
+ if svr.Connected && svr.ID != "" {
+ continue
+ }
cfg := xdsconfig.XDSServerConf{
ID: svr.ID,
URL: svr.URL,
cfg := xdsconfig.XDSServerConf{
ID: svr.ID,
URL: svr.URL,
@@
-79,6
+82,14
@@
func (s *APIService) setConfig(c *gin.Context) {
}
}
}
}
+ // Update XdsServer config
+ for _, svrCfg := range cfgArg.Servers {
+ if err := s.UpdateXdsServer(svrCfg); err != nil {
+ // willingly ignore error
+ // s.Log.Debugf("Error while updating XDS Server config: %v", err)
+ }
+ }
+
c.JSON(http.StatusOK, s._getConfig())
}
c.JSON(http.StatusOK, s._getConfig())
}