test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-01 03:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/goodrain/rainbond

Browse Source
This commit is contained in:
barnett 2018-12-01 13:38:06 +08:00
commit ecf7b7aa43
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gateway/controller/openresty/service.go
View File

@ -116,11 +116,14 @@ func (osvc *OrService) PersistConfig(conf *v1.Config) error {
logrus.Errorf("Cant not remove directory(%s): %v", template.CustomConfigPath, err)
}
if err := osvc.persistUpstreams(conf.HTTPPools, "upstreams-http.tmpl", "http/upstreams.conf"); err != nil {
if err := osvc.persistUpstreams(conf.HTTPPools, "upstreams-http.tmpl", template.CustomConfigPath, "http/upstreams.conf"); err != nil {
logrus.Errorf("fail to persist http upstreams.conf ")
}
if err := osvc.persistUpstreams(conf.TCPPools, "upstreams-tcp.tmpl", "stream/upstreams.conf"); err != nil {
if err := osvc.persistUpstreams(conf.TCPPools, "upstreams-tcp.tmpl", template.CustomConfigPath, "stream/upstreams.conf"); err != nil {
logrus.Errorf("fail to persist tcp upstreams.conf")
}
pools := append(conf.HTTPPools, conf.TCPPools...)
if err := osvc.persistUpstreams(pools, "update-ups.tmpl", "/run/nginx/","update-ups.conf"); err != nil {
logrus.Errorf("fail to persist tcp upstreams.conf")
}
@ -159,10 +162,10 @@ func (osvc *OrService) PersistConfig(conf *v1.Config) error {
}
// persistUpstreams persists upstreams
func (osvc *OrService) persistUpstreams(pools []*v1.Pool, tmpl string, filename string) error {
var upstreams []model.Upstream
func (osvc *OrService) persistUpstreams(pools []*v1.Pool, tmpl string, path string, filename string) error {
var upstreams []*model.Upstream
for _, pool := range pools {
upstream := model.Upstream{}
upstream := &model.Upstream{}
upstream.Name = pool.Name
var servers []model.UServer
for _, node := range pool.Nodes {
@ -178,15 +181,10 @@ func (osvc *OrService) persistUpstreams(pools []*v1.Pool, tmpl string, filename
upstreams = append(upstreams, upstream)
}
if len(upstreams) > 0 {
if err := template.NewUpstreamTemplate(upstreams, tmpl, filename); err != nil {
if err := template.NewUpstreamTemplateWithCfgPath(upstreams, tmpl, path, filename); err != nil {
logrus.Errorf("Fail to new nginx Upstream config file: %v", err)
return err
}
if err := template.NewUpdateUpsTemplate(upstreams,
"update-ups.tmpl", "/run/nginx/", "update-ups.conf"); err != nil {
logrus.Errorf("Fail to new update-ups.conf: %v", err)
return err
}
}
return nil
}

2
hack/contrib/docker/gateway/nginxtmp/tmpl/nginx.tmpl
View File

@ -87,7 +87,7 @@ http {
}
}
include update-ups.conf;
include update-ups*.conf;
location /delete-upstreams {
content_by_lua_block {