test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-04 20:57:38 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'V5.0' of https://github.com/goodrain/rainbond into V5.0

Browse Source
This commit is contained in:
barnett 2018-12-26 14:49:06 +08:00
commit aa48399d82
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/gateway/option/option.go
View File

@ -58,7 +58,6 @@ type Config struct {
KeepaliveRequests int KeepaliveRequests int
NginxUser string NginxUser string
RBDServerInIP string // internal ip for raidbond server RBDServerInIP string // internal ip for raidbond server
RBDServerExIP string // external ip for raidbond server
IP string IP string
// health check // health check
HealthPath string HealthPath string
@ -89,11 +88,10 @@ func (g *GWServer) AddFlags(fs *pflag.FlagSet) {
fs.BoolVar(&g.EnableMultiAccept, "enable-multi-accept", true, "Accept as many connections as possible, after nginx gets notification about a new connection.") fs.BoolVar(&g.EnableMultiAccept, "enable-multi-accept", true, "Accept as many connections as possible, after nginx gets notification about a new connection.")
fs.StringVar(&g.ErrorLog, "error-log", "/dev/stderr crit", "only log critical errors") fs.StringVar(&g.ErrorLog, "error-log", "/dev/stderr crit", "only log critical errors")
fs.StringVar(&g.NginxUser, "nginx-user", "root", "nginx user name") fs.StringVar(&g.NginxUser, "nginx-user", "root", "nginx user name")
fs.IntVar(&g.KeepaliveRequests, "keepalive-requests", 100000, "Number of requests a client can make over the keep-alive connection. This is set high for testing.") fs.IntVar(&g.KeepaliveRequests, "keepalive-requests", 10000, "Number of requests a client can make over the keep-alive connection. ")
fs.IntVar(&g.KeepaliveTimeout, "keepalive-timeout", 30, "Timeout for keep-alive connections. Server will close connections after this time.") fs.IntVar(&g.KeepaliveTimeout, "keepalive-timeout", 30, "Timeout for keep-alive connections. Server will close connections after this time.")
fs.StringVar(&g.RBDServerInIP, "rbdsrv-internal-ip", "0.0.0.0", "Internal ip for raidbond server") fs.StringVar(&g.RBDServerInIP, "rbdsrv-internal-ip", "0.0.0.0", "Internal ip for raidbond server")
fs.StringVar(&g.RBDServerExIP, "rbdsrv-external-ip", "0.0.0.0", "External ip for raidbond server") // TODO: more detail fs.StringVar(&g.IP, "ip", "0.0.0.0", "Node ip.") // TODO: more detail
fs.StringVar(&g.IP, "ip", "0.0.0.0", "Node ip.") // TODO: more detail
// etcd // etcd
fs.StringSliceVar(&g.EtcdEndPoints, "etcd-endpoints", []string{"http://127.0.0.1:2379"}, "etcd cluster endpoints.") fs.StringSliceVar(&g.EtcdEndPoints, "etcd-endpoints", []string{"http://127.0.0.1:2379"}, "etcd cluster endpoints.")
fs.IntVar(&g.EtcdTimeout, "etcd-timeout", 5, "etcd http timeout seconds") fs.IntVar(&g.EtcdTimeout, "etcd-timeout", 5, "etcd http timeout seconds")

10
gateway/controller/openresty/template/func_map.go
View File

@ -61,6 +61,8 @@ func buildLuaHeaderRouter(input interface{}) string {
} }
snippet = append(snippet, fmt.Sprintf("\t\t\tif %s then", strings.Join(condition, " and "))) snippet = append(snippet, fmt.Sprintf("\t\t\tif %s then", strings.Join(condition, " and ")))
snippet = append(snippet, fmt.Sprintf("\t\t\t\tngx.var.target = \"%s\"", name)) snippet = append(snippet, fmt.Sprintf("\t\t\t\tngx.var.target = \"%s\"", name))
snippet = append(snippet, "\t\t\t\telse")
snippet = append(snippet, "\t\t\t\t\tngx.exit(404)")
snippet = append(snippet, "\t\t\tend") snippet = append(snippet, "\t\t\tend")
priority[2] = strings.Join(snippet, "\n\r") priority[2] = strings.Join(snippet, "\n\r")
case v1.CookieType: case v1.CookieType:
@ -86,7 +88,13 @@ func buildLuaHeaderRouter(input interface{}) string {
} }
snippet = append(snippet, fmt.Sprintf("\t\t\t\tif %s then", strings.Join(condition, " and "))) snippet = append(snippet, fmt.Sprintf("\t\t\t\tif %s then", strings.Join(condition, " and ")))
snippet = append(snippet, fmt.Sprintf("\t\t\t\t\tngx.var.target = \"%s\"", name)) snippet = append(snippet, fmt.Sprintf("\t\t\t\t\tngx.var.target = \"%s\"", name))
snippet = append(snippet, "\t\t\t\tend", "\t\t\tend") snippet = append(snippet, "\t\t\t\telse")
snippet = append(snippet, "\t\t\t\t\tngx.exit(404)")
snippet = append(snippet, "\t\t\t\tend")
snippet = append(snippet, "\t\t\t\telse")
snippet = append(snippet, "\t\t\t\t\tngx.exit(404)")
snippet = append(snippet, "\t\t\tend")
priority[1] = strings.Join(snippet, "\n\r") priority[1] = strings.Join(snippet, "\n\r")
default: default:
snippet := fmt.Sprintf("\t\t\tngx.var.target = \"%s\"", name) snippet := fmt.Sprintf("\t\t\tngx.var.target = \"%s\"", name)