Merge pull request #21 from bilibili/bug_fix/fix_nodesproc

fix nodesproc
bilibili · May 17, 2019 · 2dfe995 · 2dfe995
2 parents 0d90798 + a1451a0
commit 2dfe995
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 #### Discovery
+##### Version 1.0.2
+> 1.fix nodesproc. get all zone nodes.
+
 ##### Version 1.0.1
 > 1.rename import path  
 

diff --git a/discovery/syncup.go b/discovery/syncup.go
@@ -107,7 +107,6 @@ func (d *Discovery) nodesproc() {
 	for {
 		arg := &model.ArgPolls{
 			AppID:           []string{model.AppID},
-			Zone:            d.c.Env.Zone,
 			Env:             d.c.Env.DeployEnv,
 			Hostname:        d.c.Env.Host,
 			LatestTimestamp: []int64{lastTs},
@@ -132,7 +131,7 @@ func (d *Discovery) nodesproc() {
 				for _, addr := range in.Addrs {
 					u, err := url.Parse(addr)
 					if err == nil && u.Scheme == "http" {
-						if in.Zone == arg.Zone {
+						if in.Zone == d.c.Env.Zone {
 							nodes = append(nodes, u.Host)
 						} else {
 							zones[in.Zone] = append(zones[in.Zone], u.Host)