vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3510 from xiang90/v3_raft 

etcdmain: support gRPC addr flag
release-2.3
Xiang Li 2015-09-12 22:58:08 -07:00
parent 35f1531576 a0cfcf2dd7
commit 662b4966d0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdmain/config.go
View File

@ -117,7 +117,8 @@ type config struct {
printVersion bool
v3demo bool
v3demo bool
gRPCAddr string
ignored []string
}
@ -216,6 +217,7 @@ func NewConfig() *config {
// demo flag
fs.BoolVar(&cfg.v3demo, "experimental-v3demo", false, "Enable experimental v3 demo API")
fs.StringVar(&cfg.gRPCAddr, "experimental-gRPC-addr", "127.0.0.1:2378", "gRPC address for experimental v3 demo API")
// backwards-compatibility with v0.4.6
fs.Var(&flags.IPAddressPort{}, "addr", "DEPRECATED: Use -advertise-client-urls instead.")

4
etcdmain/etcd.go
View File

@ -239,11 +239,11 @@ func startEtcd(cfg *config) (<-chan struct{}, error) {
var v3l net.Listener
if cfg.v3demo {
v3l, err = net.Listen("tcp", "127.0.0.1:12379")
v3l, err = net.Listen("tcp", cfg.gRPCAddr)
if err != nil {
plog.Fatal(err)
}
plog.Infof("listening for client rpc on 127.0.0.1:12379")
plog.Infof("listening for client rpc on %s", cfg.gRPCAddr)
}
srvcfg := &etcdserver.ServerConfig{