diff --git a/pkg/naming/etcd/etcd.go b/pkg/naming/etcd/etcd.go index f64f107f4..338b216eb 100644 --- a/pkg/naming/etcd/etcd.go +++ b/pkg/naming/etcd/etcd.go @@ -19,9 +19,9 @@ import ( ) var ( - //Prefix is a etcd globe key prefix - Endpoints string - Prefix string + //etcdPrefix is a etcd globe key prefix + endpoints string + etcdPrefix string RegisterTTL = 30 ) @@ -39,8 +39,8 @@ func init() { func addFlag(fs *flag.FlagSet) { // env - fs.StringVar(&Endpoints, "etcd.endpoints", os.Getenv("ETCD_ENDPOINTS"), "etcd.endpoints is etcd endpoints. value: 127.0.0.1:2379,127.0.0.2:2379 etc.") - fs.StringVar(&Prefix, "etcd.prefix", defaultString("ETCD_PREFIX", "kratos_etcd"), "etcd globe key prefix or use ETCD_PREFIX env variable. value etcd_prefix etc.") + fs.StringVar(&endpoints, "etcd.endpoints", os.Getenv("ETCD_ENDPOINTS"), "etcd.endpoints is etcd endpoints. value: 127.0.0.1:2379,127.0.0.2:2379 etc.") + fs.StringVar(&etcdPrefix, "etcd.prefix", defaultString("ETCD_PREFIX", "kratos_etcd"), "etcd globe key prefix or use ETCD_PREFIX env variable. value etcd_prefix etc.") } func defaultString(env, value string) string { @@ -91,11 +91,11 @@ type Resolve struct { // New is new a etcdbuilder func New(c *clientv3.Config) (e *EtcdBuilder, err error) { if c == nil { - if Endpoints == "" { - panic(fmt.Errorf("invalid etcd config endpoints:%+v", Endpoints)) + if endpoints == "" { + panic(fmt.Errorf("invalid etcd config endpoints:%+v", endpoints)) } c = &clientv3.Config{ - Endpoints: strings.Split(Endpoints, ","), + Endpoints: strings.Split(endpoints, ","), DialTimeout: time.Second * 30, } } @@ -227,7 +227,7 @@ func (e *EtcdBuilder) unregister(ins *naming.Instance) (err error) { } func (e *EtcdBuilder) keyPrefix(ins *naming.Instance) string { - return fmt.Sprintf("/%s/%s/%s", Prefix, ins.AppID, ins.Hostname) + return fmt.Sprintf("/%s/%s/%s", etcdPrefix, ins.AppID, ins.Hostname) } // Close stop all running process including etcdfetch and register @@ -237,7 +237,7 @@ func (e *EtcdBuilder) Close() error { } func (a *appInfo) watch(appID string) { _ = a.fetchstore(appID) - prefix := fmt.Sprintf("/%s/%s/", Prefix, appID) + prefix := fmt.Sprintf("/%s/%s/", etcdPrefix, appID) rch := a.e.cli.Watch(a.e.ctx, prefix, clientv3.WithPrefix()) for wresp := range rch { for _, ev := range wresp.Events { @@ -249,7 +249,7 @@ func (a *appInfo) watch(appID string) { } func (a *appInfo) fetchstore(appID string) (err error) { - prefix := fmt.Sprintf("/%s/%s/", Prefix, appID) + prefix := fmt.Sprintf("/%s/%s/", etcdPrefix, appID) resp, err := a.e.cli.Get(a.e.ctx, prefix, clientv3.WithPrefix()) if err != nil { log.Error("etcd: fetch client.Get(%s) error(%+v)", prefix, err) diff --git a/pkg/naming/etcd/etcd_test.go b/pkg/naming/etcd/etcd_test.go index 85cbfe69b..445958725 100644 --- a/pkg/naming/etcd/etcd_test.go +++ b/pkg/naming/etcd/etcd_test.go @@ -42,7 +42,6 @@ func TestNew(t *testing.T) { Zone: "z1", }) - fmt.Println(2222) app2Cancel, err := builder.Register(context.Background(), &naming.Instance{ AppID: "app2", Hostname: "h5",