Kaynağa Gözat

fix discovery

lxg 4 yıl önce
ebeveyn
işleme
9d1e6af7ea
4 değiştirilmiş dosya ile 12 ekleme ve 8 silme
  1. 3 1
      .idea/workspace.xml
  2. 1 3
      registry/discovery.go
  3. 7 1
      registry/registry.go
  4. 1 3
      service.go

+ 3 - 1
.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="cd58867b-089e-4508-9033-393b8939261c" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/request.go" beforeDir="false" afterPath="$PROJECT_DIR$/request.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/registry/discovery.go" beforeDir="false" afterPath="$PROJECT_DIR$/registry/discovery.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/registry/registry.go" beforeDir="false" afterPath="$PROJECT_DIR$/registry/registry.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 1 - 3
registry/discovery.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"io"
 	"net/http"
-	"os"
 	"time"
 )
 
@@ -83,8 +82,7 @@ func (r *Discovery) Fetch() (instances []*ServiceNode, err error) {
 	return
 }
 
-func newDiscovery() *Discovery {
-	uri := os.Getenv("DISCOVERY_URL")
+func NewDiscovery(uri string) *Discovery {
 	if uri == "" {
 		uri = "https://discovery.nspix.com"
 	}

+ 7 - 1
registry/registry.go

@@ -1,9 +1,15 @@
 package registry
 
+import "os"
+
 var (
 	DefaultRegistry Registry
 )
 
+const (
+	DiscoveryUrlEvn = "DISCOVERY_URL"
+)
+
 type (
 	Registry interface {
 		Register(instance *ServiceNode) (err error)
@@ -14,5 +20,5 @@ type (
 )
 
 func init() {
-	DefaultRegistry = newDiscovery()
+	DefaultRegistry = NewDiscovery(os.Getenv(DiscoveryUrlEvn))
 }

+ 1 - 3
service.go

@@ -197,9 +197,7 @@ func (svr *Service) prepare() (err error) {
 	svr.wrapSync(func() {
 		svr.eventLoop()
 	})
-	if err = svr.registry.Register(svr.node); err == nil {
-		log.Infof("register service %s successful", svr.opts.Name)
-	}
+	_ = svr.registry.Register(svr.node)
 	return
 }