diff --git a/common/rpc_service_test.go b/common/rpc_service_test.go index f0301e01a6f5e1d4826d2765e949954a1501b779..7df039b905d3cc064c5d6d9404fc874cf693dac9 100644 --- a/common/rpc_service_test.go +++ b/common/rpc_service_test.go @@ -76,22 +76,23 @@ func (s *TestService1) Reference() string { func TestServiceMap_Register(t *testing.T) { // lowercase s0 := &testService{} - methods, err := ServiceMap.Register("testporotocol", s0) + // methods, err := ServiceMap.Register("testporotocol", s0) + _, err := ServiceMap.Register("testporotocol", s0) assert.EqualError(t, err, "type testService is not exported") // succ s := &TestService{} - methods, err = ServiceMap.Register("testporotocol", s) + methods, err := ServiceMap.Register("testporotocol", s) assert.NoError(t, err) assert.Equal(t, "MethodOne,MethodThree,methodTwo", methods) // repeat - methods, err = ServiceMap.Register("testporotocol", s) + _, err = ServiceMap.Register("testporotocol", s) assert.EqualError(t, err, "service already defined: com.test.Path") // no method s1 := &TestService1{} - methods, err = ServiceMap.Register("testporotocol", s1) + _, err = ServiceMap.Register("testporotocol", s1) assert.EqualError(t, err, "type com.test.Path1 has no exported methods of suitable type") ServiceMap = &serviceMap{ diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go index 6b526b0c67df2d693214295c94dfeb35200ffec4..ef0761efcd0d2cee47425dd5e1099200d3be6a70 100644 --- a/config_center/zookeeper/impl.go +++ b/config_center/zookeeper/impl.go @@ -69,7 +69,7 @@ func newZookeeperDynamicConfiguration(url *common.URL) (*zookeeperDynamicConfigu err = c.client.Create(c.rootPath) c.listener.ListenServiceEvent(c.rootPath, c.cacheListener) - return c, nil + return c, err } @@ -95,7 +95,7 @@ func newMockZookeeperDynamicConfiguration(url *common.URL, opts ...zookeeper.Opt err = c.client.Create(c.rootPath) go c.listener.ListenServiceEvent(c.rootPath, c.cacheListener) - return tc, c, nil + return tc, c, err } diff --git a/go.mod b/go.mod index 75a3cea2c4cd3ca6f4a970c285aff6ba6ad1bb9b..caf01f8c0842b134611f3369c10cac7e800149fe 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,8 @@ module github.com/apache/dubbo-go require ( github.com/dubbogo/getty v1.1.2-0.20190703052458-5e72c69fddc7 - github.com/dubbogo/gost v1.0.0 - github.com/dubbogo/hessian2 v1.1.2 + github.com/dubbogo/gost v1.1.1 + github.com/dubbogo/hessian2 v1.2.0 github.com/magiconair/properties v1.8.1 github.com/pkg/errors v0.8.1 github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec diff --git a/go.sum b/go.sum index 3cc46c3f275b72829e8ab254f2c9a8d66198def2..30d19769894d5eaa346083229374ced1a889af81 100644 --- a/go.sum +++ b/go.sum @@ -3,12 +3,12 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dubbogo/getty v1.1.2-0.20190703052458-5e72c69fddc7 h1:WDzbrHOfdO78mFp3RJgGRM0u2+DEwrVzo58InIdgcX8= github.com/dubbogo/getty v1.1.2-0.20190703052458-5e72c69fddc7/go.mod h1:DfbsJXdXj6DliCAEgrRbwC7J5rz+2sOPGKKEvlF6OjE= -github.com/dubbogo/gost v1.0.0 h1:obKvpJYdrIY2BidHYwYoj2E50OtwCDqVVVTcH2nnhAY= -github.com/dubbogo/gost v1.0.0/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg= +github.com/dubbogo/gost v1.1.1 h1:JCM7vx5edPIjDA5ovJTuzEEXuw2t7xLyrlgi2mi5jHI= +github.com/dubbogo/gost v1.1.1/go.mod h1:R7wZm1DrmrKGr50mBZVcg6C9ekG8aL5hP+sgWcIDwQg= github.com/dubbogo/gostd v0.0.0-20190625030817-87d8669125b7 h1:Wmt8yQMGkNx4GDUvU4CA+dwIsDwgi+DbP28NZV2ruqQ= github.com/dubbogo/gostd v0.0.0-20190625030817-87d8669125b7/go.mod h1:lQ7PmKvs6xplvjzEEMKw8XmP20D9raD+wFfzxkKaBd4= -github.com/dubbogo/hessian2 v1.1.2 h1:SRkPzIwVv2D+ZUOCE2XuI5kANoL01ShhAheLcc3usJE= -github.com/dubbogo/hessian2 v1.1.2/go.mod h1:XFGDn4oSZX26zkcfhkM/fCJrOqwQJxk/xgWW1KMJBKM= +github.com/dubbogo/hessian2 v1.2.0 h1:5wFYuMzzRhneUAPbVBVKubIknrEjUM/B76vievYD0Vw= +github.com/dubbogo/hessian2 v1.2.0/go.mod h1:7EohF3mE7xmZcj43nP172sapRHOEifcV/jwyHhG4SaY= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= diff --git a/protocol/dubbo/client_test.go b/protocol/dubbo/client_test.go index a0da21d5dd6298b27880441be9782941a66b8892..8c24098b482979f5680ad74eaef37656473c8267 100644 --- a/protocol/dubbo/client_test.go +++ b/protocol/dubbo/client_test.go @@ -26,7 +26,7 @@ import ( ) import ( - "github.com/dubbogo/hessian2" + hessian "github.com/dubbogo/hessian2" perrors "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/protocol/jsonrpc/json_test.go b/protocol/jsonrpc/json_test.go index 8d3ac5dabb69acbfc3ca9846ebd1575a53b32eb8..ade74246121b5f275c8dbeaa5923228dbab2804f 100644 --- a/protocol/jsonrpc/json_test.go +++ b/protocol/jsonrpc/json_test.go @@ -42,7 +42,7 @@ func TestJsonClientCodec_Write(t *testing.T) { assert.Equal(t, "{\"jsonrpc\":\"2.0\",\"method\":\"GetUser\",\"params\":[\"args\",2],\"id\":1}\n", string(data)) cd.Args = 1 - data, err = codec.Write(cd) + _, err = codec.Write(cd) assert.EqualError(t, err, "unsupported param type: int") } diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go index 6b15133319975ee6cb305482b1cfd17aacbca5b6..c272c5bba615c68c452f36819edef0f2a821a5dc 100644 --- a/registry/zookeeper/registry.go +++ b/registry/zookeeper/registry.go @@ -211,7 +211,6 @@ func (r *zkRegistry) Register(conf common.URL) error { role, _ := strconv.Atoi(r.URL.GetParam(constant.ROLE_KEY, "")) switch role { case common.CONSUMER: - ok = false r.cltLock.Lock() _, ok = r.services[conf.Key()] r.cltLock.Unlock() @@ -232,7 +231,6 @@ func (r *zkRegistry) Register(conf common.URL) error { case common.PROVIDER: // 妫€楠屾湇鍔℃槸鍚﹀凡缁忔敞鍐岃繃 - ok = false r.cltLock.Lock() // 娉ㄦ剰姝ゅ涓巆onsumerZookeeperRegistry鐨勫樊寮傦紝consumer鐢ㄧ殑鏄痗onf.Path锛� // 鍥犱负consumer瑕佹彁渚泈atch鍔熻兘缁檚elector浣跨敤, provider鍏佽娉ㄥ唽鍚屼竴涓猻ervice鐨勫涓猤roup or version diff --git a/registry/zookeeper/registry_test.go b/registry/zookeeper/registry_test.go index 168246e1579c26d515bca836a3ad1cf66b26bfcd..2b5e2f8f7caf749be28bf3ff6e5d14980d70f2f4 100644 --- a/registry/zookeeper/registry_test.go +++ b/registry/zookeeper/registry_test.go @@ -38,9 +38,9 @@ func Test_Register(t *testing.T) { regurl, _ := common.NewURL(context.TODO(), "registry://127.0.0.1:1111", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER))) url, _ := common.NewURL(context.TODO(), "dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParamsValue(constant.CLUSTER_KEY, "mock"), common.WithParamsValue("serviceid", "soa.mock"), common.WithMethods([]string{"GetUser", "AddUser"})) - ts, reg, err := newMockZkRegistry(®url) + ts, reg, _ := newMockZkRegistry(®url) defer ts.Stop() - err = reg.Register(url) + err := reg.Register(url) children, _ := reg.client.GetChildren("/dubbo/com.ikurento.user.UserProvider/providers") assert.Regexp(t, ".*dubbo%3A%2F%2F127.0.0.1%3A20000%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26category%3Dproviders%26cluster%3Dmock%26dubbo%3Ddubbo-provider-golang-2.6.0%26.*.serviceid%3Dsoa.mock%26.*provider", children) assert.NoError(t, err) @@ -49,10 +49,10 @@ func Test_Register(t *testing.T) { func Test_Subscribe(t *testing.T) { regurl, _ := common.NewURL(context.TODO(), "registry://127.0.0.1:1111", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER))) url, _ := common.NewURL(context.TODO(), "dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParamsValue(constant.CLUSTER_KEY, "mock"), common.WithMethods([]string{"GetUser", "AddUser"})) - ts, reg, err := newMockZkRegistry(®url) + ts, reg, _ := newMockZkRegistry(®url) //provider register - err = reg.Register(url) + err := reg.Register(url) assert.NoError(t, err) if err != nil { @@ -61,12 +61,12 @@ func Test_Subscribe(t *testing.T) { //consumer register regurl.Params.Set(constant.ROLE_KEY, strconv.Itoa(common.CONSUMER)) - _, reg2, err := newMockZkRegistry(®url, zookeeper.WithTestCluster(ts)) + _, reg2, _ := newMockZkRegistry(®url, zookeeper.WithTestCluster(ts)) - err = reg2.Register(url) - listener, err := reg2.Subscribe(url) + reg2.Register(url) + listener, _ := reg2.Subscribe(url) - serviceEvent, err := listener.Next() + serviceEvent, _ := listener.Next() assert.NoError(t, err) if err != nil { return @@ -103,7 +103,7 @@ func Test_ProviderDestory(t *testing.T) { defer ts.Stop() assert.NoError(t, err) - err = reg.Register(url) + reg.Register(url) //listener.Close() time.Sleep(1e9)