Added http-transport to SERVER call
* fixed index out of range error when --http-transport provided without value.
This commit is contained in:
parent
23e846e9df
commit
cadf6cb851
@ -109,7 +109,7 @@ func main() {
|
|||||||
case "--dev", "-dev":
|
case "--dev", "-dev":
|
||||||
devMode = true
|
devMode = true
|
||||||
continue
|
continue
|
||||||
case "--http-transport":
|
case "--http-transport", "-http-transport":
|
||||||
i++
|
i++
|
||||||
if i < len(os.Args) {
|
if i < len(os.Args) {
|
||||||
switch strings.ToLower(os.Args[i]) {
|
switch strings.ToLower(os.Args[i]) {
|
||||||
@ -120,6 +120,8 @@ func main() {
|
|||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
fmt.Fprintf(os.Stderr, "http-transport must be 'yes' or 'no'\n")
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
nargs = append(nargs, os.Args[i])
|
nargs = append(nargs, os.Args[i])
|
||||||
}
|
}
|
||||||
@ -153,11 +155,6 @@ func main() {
|
|||||||
gitsha = ""
|
gitsha = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
httpTransportEnabled := "Enabled"
|
|
||||||
if !httpTransport {
|
|
||||||
httpTransportEnabled = "Disabled"
|
|
||||||
}
|
|
||||||
|
|
||||||
// _____ _ _ ___ ___
|
// _____ _ _ ___ ___
|
||||||
// |_ _|_| |___|_ | . |
|
// |_ _|_| |___|_ | . |
|
||||||
// | | | | | -_|_ | . |
|
// | | | | | -_|_ | . |
|
||||||
@ -168,10 +165,10 @@ func main() {
|
|||||||
| | |
|
| | |
|
||||||
|____ | _ | Tile38 %s%s %d bit (%s/%s)
|
|____ | _ | Tile38 %s%s %d bit (%s/%s)
|
||||||
| | | %sPort: %d, PID: %d
|
| | | %sPort: %d, PID: %d
|
||||||
|____ | _ | HTTP & WebSocket transports: %s
|
|____ | _ |
|
||||||
| | |
|
| | |
|
||||||
|_______|_______| tile38.com
|
|_______|_______| tile38.com
|
||||||
`+"\n", core.Version, gitsha, strconv.IntSize, runtime.GOARCH, runtime.GOOS, hostd, port, os.Getpid(), httpTransportEnabled)
|
`+"\n", core.Version, gitsha, strconv.IntSize, runtime.GOARCH, runtime.GOOS, hostd, port, os.Getpid())
|
||||||
|
|
||||||
if err := controller.ListenAndServe(host, port, dir, httpTransport); err != nil {
|
if err := controller.ListenAndServe(host, port, dir, httpTransport); err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
|
@ -84,6 +84,7 @@ type Controller struct {
|
|||||||
expires map[string]map[string]time.Time
|
expires map[string]map[string]time.Time
|
||||||
conns map[*server.Conn]bool
|
conns map[*server.Conn]bool
|
||||||
started time.Time
|
started time.Time
|
||||||
|
http bool
|
||||||
|
|
||||||
epc *endpoint.EndpointManager
|
epc *endpoint.EndpointManager
|
||||||
|
|
||||||
@ -121,6 +122,7 @@ func ListenAndServeEx(host string, port int, dir string, ln *net.Listener, http
|
|||||||
started: time.Now(),
|
started: time.Now(),
|
||||||
conns: make(map[*server.Conn]bool),
|
conns: make(map[*server.Conn]bool),
|
||||||
epc: endpoint.NewEndpointManager(),
|
epc: endpoint.NewEndpointManager(),
|
||||||
|
http: http,
|
||||||
}
|
}
|
||||||
if err := os.MkdirAll(dir, 0700); err != nil {
|
if err := os.MkdirAll(dir, 0700); err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -81,6 +81,7 @@ func (c *Controller) cmdServer(msg *server.Message) (res string, err error) {
|
|||||||
m["following"] = fmt.Sprintf("%s:%d", c.config.FollowHost, c.config.FollowPort)
|
m["following"] = fmt.Sprintf("%s:%d", c.config.FollowHost, c.config.FollowPort)
|
||||||
m["caught_up"] = c.fcup
|
m["caught_up"] = c.fcup
|
||||||
}
|
}
|
||||||
|
m["http_transport"] = c.http
|
||||||
m["pid"] = os.Getpid()
|
m["pid"] = os.Getpid()
|
||||||
m["aof_size"] = c.aofsz
|
m["aof_size"] = c.aofsz
|
||||||
m["num_collections"] = c.cols.Len()
|
m["num_collections"] = c.cols.Len()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user