diff --git a/registry/consul/registry.go b/registry/consul/registry.go index 33bf6d2c3897b0e4c78d36198f09446d59f94a31..a00ec2518809731a1473ac184e7c4bc39d9a08da 100644 --- a/registry/consul/registry.go +++ b/registry/consul/registry.go @@ -36,7 +36,7 @@ import ( ) const ( - registryConnDelay = 3 + registryConnDelay = 3 registryDestroyDefaultTimeout = time.Second ) @@ -69,9 +69,9 @@ func newConsulRegistry(url *common.URL) (registry.Registry, error) { } r := &consulRegistry{ - URL: url, - client: client, - done: make(chan struct{}), + URL: url, + client: client, + done: make(chan struct{}), timeOut: registryDestroyDefaultTimeout, } @@ -192,24 +192,24 @@ func (r *consulRegistry) IsAvailable() bool { // Destroy consul registry center func (r *consulRegistry) Destroy() { - if r.URL != nil{ + if r.URL != nil { done := make(chan struct{}, 1) ticker := time.NewTicker(r.timeOut) - go func(){ - defer func(){ - if e := recover(); e != nil{ + go func() { + defer func() { + if e := recover(); e != nil { logger.Errorf("consulRegistry destory with panic: %v", e) } done <- struct{}{} }() - if err := r.UnRegister(*r.URL); err != nil{ + if err := r.UnRegister(*r.URL); err != nil { logger.Errorf("consul registry unregister with err: %s", err.Error()) } }() select { - case <- done: + case <-done: logger.Infof("consulRegistry unregister done") - case <- ticker.C: + case <-ticker.C: logger.Errorf("consul unregister timeout") ticker.Stop() } diff --git a/registry/consul/registry_test.go b/registry/consul/registry_test.go index bc4fd400eba82b5f644426a922cf0018cf862d72..b300f7536ddf35f2a4d062900b1f3e4eda33f25d 100644 --- a/registry/consul/registry_test.go +++ b/registry/consul/registry_test.go @@ -56,7 +56,7 @@ func (suite *consulRegistryTestSuite) testSubscribe() { suite.listener = listener } -func (suite *consulRegistryTestSuite) testDestroy(){ +func (suite *consulRegistryTestSuite) testDestroy() { consumerRegistryUrl := newConsumerRegistryUrl(registryHost, registryPort) consumerRegistry, _ := newConsulRegistry(consumerRegistryUrl) consulRegistryImp := consumerRegistry.(*consulRegistry) diff --git a/registry/consul/utils_test.go b/registry/consul/utils_test.go index 819feb2916a958bd99f78d7ff33f7568b212c3bf..0e5bffe457b9e3317ff056c51e4f5a9633a429e6 100644 --- a/registry/consul/utils_test.go +++ b/registry/consul/utils_test.go @@ -187,8 +187,6 @@ func test2(t *testing.T) { suite.testDestroy() } - - func TestConsulRegistry(t *testing.T) { t.Run("test1", test1) t.Run("test2", test2)