Skip to content
Snippets Groups Projects
Commit 9a5c0e8d authored by vito.he's avatar vito.he
Browse files

Fix: zk registry params deep copy

parent cdf86151
No related branches found
No related tags found
No related merge requests found
......@@ -99,6 +99,9 @@ func (srvconfig *ServiceConfig) Export() error {
}
srvconfig.cacheMutex.Unlock()
exporter := srvconfig.cacheProtocol.Export(invoker)
if exporter == nil{
panic(jerrors.New("New exporter error"))
}
srvconfig.exporters = append(srvconfig.exporters, exporter)
}
}
......
......@@ -47,7 +47,7 @@ func main() {
initProfiling()
time.Sleep(5e9)
time.Sleep(10e9)
gxlog.CInfo("\n\n\nstart to test jsonrpc")
user := &JsonRPCUser{}
......
......@@ -96,7 +96,8 @@ func (proto *RegistryProtocol) Export(invoker protocol.Invoker) protocol.Exporte
err := reg.Register(providerUrl)
if err != nil {
log.Error("provider service %v register registry %v error, error message is %s", providerUrl.String(), registryUrl.String(), err.Error())
log.Error("provider service %v register registry %v error, error message is %s", providerUrl.Key(), registryUrl.Key(), err.Error())
return nil
}
key := providerUrl.Key()
......
......@@ -3,7 +3,6 @@ package zookeeper
import (
"context"
"fmt"
"github.com/dubbo/dubbo-go/common/constant"
"net/url"
"os"
"strconv"
......@@ -20,6 +19,7 @@ import (
)
import (
"github.com/dubbo/dubbo-go/common/constant"
"github.com/dubbo/dubbo-go/common/extension"
"github.com/dubbo/dubbo-go/config"
"github.com/dubbo/dubbo-go/registry"
......@@ -89,7 +89,7 @@ func NewZkRegistry(url *config.URL) (registry.Registry, error) {
err = r.validateZookeeperClient()
if err != nil {
return nil, jerrors.Trace(err)
return nil, err
}
r.wg.Add(1)
......@@ -185,6 +185,7 @@ LOOP:
if err == nil {
// copy r.services
r.cltLock.Lock()
services = []config.URL{}
for _, confIf = range r.services {
services = append(services, confIf)
}
......@@ -291,7 +292,9 @@ func (r *ZkRegistry) register(c config.URL) error {
return jerrors.Trace(err)
}
params = url.Values{}
params = c.Params
for k, v := range c.Params {
params[k] = v
}
params.Add("pid", processID)
params.Add("ip", localIP)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment