From a0cfcf2dd705f4f3cd5fabb42fb370e280679b70 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Sat, 12 Sep 2015 22:52:51 -0700 Subject: [PATCH] etcdmain: support gRPC addr flag --- etcdmain/config.go | 4 +++- etcdmain/etcd.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/etcdmain/config.go b/etcdmain/config.go index c8e305643..1c41930a5 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -116,7 +116,8 @@ type config struct { printVersion bool - v3demo bool + v3demo bool + gRPCAddr string ignored []string } @@ -214,6 +215,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.") diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 8eff3ae45..1cefa574c 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -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{