added --client-token
This commit is contained in:
12
cmd/main.go
12
cmd/main.go
@@ -482,6 +482,7 @@ func main() {
|
|||||||
var cfgfile string
|
var cfgfile string
|
||||||
var cfgpat string
|
var cfgpat string
|
||||||
var logfile string
|
var logfile string
|
||||||
|
var client_token string
|
||||||
var cfg ClientConfig
|
var cfg ClientConfig
|
||||||
|
|
||||||
ctl_addrs = make([]string, 0)
|
ctl_addrs = make([]string, 0)
|
||||||
@@ -508,6 +509,10 @@ func main() {
|
|||||||
cfgpat = v
|
cfgpat = v
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
flgs.Func("client-token", "specify a client token", func(v string) error {
|
||||||
|
client_token = v
|
||||||
|
return nil
|
||||||
|
})
|
||||||
flgs.SetOutput(io.Discard)
|
flgs.SetOutput(io.Discard)
|
||||||
err = flgs.Parse(os.Args[2:])
|
err = flgs.Parse(os.Args[2:])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -541,6 +546,11 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if client_token != "" {
|
||||||
|
cfg.APP.TokenText = client_token
|
||||||
|
cfg.APP.TokenFile = ""
|
||||||
|
}
|
||||||
|
|
||||||
err = client_main(ctl_addrs, rpc_addrs, flgs.Args(), logfile, &cfg)
|
err = client_main(ctl_addrs, rpc_addrs, flgs.Args(), logfile, &cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "ERROR: client error - %s\n", err.Error())
|
fmt.Fprintf(os.Stderr, "ERROR: client error - %s\n", err.Error())
|
||||||
@@ -557,7 +567,7 @@ func main() {
|
|||||||
|
|
||||||
wrong_usage:
|
wrong_usage:
|
||||||
fmt.Fprintf(os.Stderr, "USAGE: %s server --rpc-on=addr:port --ctl-on=addr:port --rpx-on=addr:port --pxy-on=addr:port --wpx-on=addr:port [--config-file=file] [--config-file-pattern=pattern]\n", os.Args[0])
|
fmt.Fprintf(os.Stderr, "USAGE: %s server --rpc-on=addr:port --ctl-on=addr:port --rpx-on=addr:port --pxy-on=addr:port --wpx-on=addr:port [--config-file=file] [--config-file-pattern=pattern]\n", os.Args[0])
|
||||||
fmt.Fprintf(os.Stderr, " %s client --rpc-to=addr:port --ctl-on=addr:port [--config-file=file] [--config-file-pattern=pattern] [peer-addr:peer-port ...]\n", os.Args[0])
|
fmt.Fprintf(os.Stderr, " %s client --rpc-to=addr:port --ctl-on=addr:port [--config-file=file] [--config-file-pattern=pattern] [--client-token=string] [peer-addr:peer-port ...]\n", os.Args[0])
|
||||||
fmt.Fprintf(os.Stderr, " %s version\n", os.Args[0])
|
fmt.Fprintf(os.Stderr, " %s version\n", os.Args[0])
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user