From 1077cac3e705df4cd02eb28c2916a156b5256bd3 Mon Sep 17 00:00:00 2001
From: "382673304@qq.com" <382673304@qq.com>
Date: Mon, 12 Oct 2020 15:45:39 +0800
Subject: [PATCH] fix: fmt file
---
registry/consul/registry.go | 22 +++++++++++-----------
registry/consul/registry_test.go | 2 +-
registry/consul/utils_test.go | 2 --
3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/registry/consul/registry.go b/registry/consul/registry.go
index 33bf6d2c3..a00ec2518 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 bc4fd400e..b300f7536 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 819feb291..0e5bffe45 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)
--
GitLab