From 604028aef479c3ee1bc98b06f921275d8b07fec6 Mon Sep 17 00:00:00 2001
From: scott <scottwangsxll@gmail.com>
Date: Sun, 15 Mar 2020 22:53:00 +0800
Subject: [PATCH] Fix create-path and push to test
---
registry/kubernetes/listener.go | 26 ++++++++++++++------------
registry/kubernetes/listener_test.go | 5 -----
registry/kubernetes/registry.go | 9 ++-------
registry/kubernetes/registry_test.go | 6 +++++-
4 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/registry/kubernetes/listener.go b/registry/kubernetes/listener.go
index 528ec6486..d9164e714 100644
--- a/registry/kubernetes/listener.go
+++ b/registry/kubernetes/listener.go
@@ -64,19 +64,21 @@ func (l *dataListener) DataChange(eventType remoting.Event) bool {
return false
}
- if _, ok := l.interestedURL[serviceURL.String()]; !ok {
- return false
+ for _, v := range l.interestedURL {
+
+ if serviceURL.URLEqual(*v) {
+
+ l.listener.Process(
+ &config_center.ConfigChangeEvent{
+ Key: eventType.Path,
+ Value: serviceURL,
+ ConfigType: eventType.Action,
+ },
+ )
+ return true
+ }
}
-
- l.listener.Process(
- &config_center.ConfigChangeEvent{
- Key: eventType.Path,
- Value: serviceURL,
- ConfigType: eventType.Action,
- },
- )
- return true
-
+ return false
}
type configurationListener struct {
diff --git a/registry/kubernetes/listener_test.go b/registry/kubernetes/listener_test.go
index 88e158902..c9ff62608 100644
--- a/registry/kubernetes/listener_test.go
+++ b/registry/kubernetes/listener_test.go
@@ -19,8 +19,6 @@ package kubernetes
import (
"encoding/json"
- "net/http"
- _ "net/http/pprof"
"os"
"strconv"
"testing"
@@ -239,9 +237,6 @@ func (s *KubernetesRegistryTestSuite) SetupSuite() {
if err := os.Setenv(nameSpaceKey, s.currentPod.GetNamespace()); err != nil {
t.Fatal(err)
}
-
- go http.ListenAndServe(":6061", nil)
-
}
func (s *KubernetesRegistryTestSuite) TestDataChange() {
diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go
index 14dd4a372..289a42aa5 100644
--- a/registry/kubernetes/registry.go
+++ b/registry/kubernetes/registry.go
@@ -97,14 +97,9 @@ func (r *kubernetesRegistry) CloseListener() {
}
func (r *kubernetesRegistry) CreatePath(k string) error {
- var tmpPath string
- for _, str := range strings.Split(k, "/")[1:] {
- tmpPath = path.Join(tmpPath, "/", str)
- if err := r.client.Create(tmpPath, ""); err != nil {
- return perrors.WithMessagef(err, "create path %s in kubernetes", tmpPath)
- }
+ if err := r.client.Create(k, ""); err != nil {
+ return perrors.WithMessagef(err, "create path %s in kubernetes", k)
}
-
return nil
}
diff --git a/registry/kubernetes/registry_test.go b/registry/kubernetes/registry_test.go
index a01af167c..43a1bd79b 100644
--- a/registry/kubernetes/registry_test.go
+++ b/registry/kubernetes/registry_test.go
@@ -38,7 +38,11 @@ func (s *KubernetesRegistryTestSuite) TestRegister() {
r := s.initRegistry()
defer r.Destroy()
- url, _ := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParamsValue(constant.CLUSTER_KEY, "mock"), common.WithMethods([]string{"GetUser", "AddUser"}))
+ url, _ := common.NewURL(
+ "dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider",
+ common.WithParamsValue(constant.CLUSTER_KEY, "mock"),
+ common.WithMethods([]string{"GetUser", "AddUser"}),
+ )
err := r.Register(url)
assert.NoError(t, err)
--
GitLab