From f1d1a0cb321d3b2811a905b64da84a7786f8d4e8 Mon Sep 17 00:00:00 2001
From: zhangshen023 <1292369127@qq.com>
Date: Wed, 9 Sep 2020 21:03:17 +0800
Subject: [PATCH] optimized some code
---
registry/consul/service_discovery.go | 23 +++++++++----------
.../service_discovery_registry.go | 3 +--
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/registry/consul/service_discovery.go b/registry/consul/service_discovery.go
index 0d5e43c5f..ea4ea99ed 100644
--- a/registry/consul/service_discovery.go
+++ b/registry/consul/service_discovery.go
@@ -42,7 +42,12 @@ import (
)
const (
- enable = "enable"
+ enable = "enable"
+ watch_type = "type"
+ watch_type_service = "service"
+ watch_service = "service"
+ watch_passingonly = "passingonly"
+ watch_passingonly_true = true
)
// init will put the service discovery into extension
@@ -198,10 +203,7 @@ func (csd *consulServiceDiscovery) GetServices() *gxset.HashSet {
// encodeConsulMetadata because consul validate key strictly.
func encodeConsulMetadata(metadata map[string]string) map[string]string {
- consulMetadata := make(map[string]string, 8)
- if metadata == nil {
- return consulMetadata
- }
+ consulMetadata := make(map[string]string, len(metadata))
encoder := base64.RawStdEncoding
for k, v := range metadata {
consulMetadata[encoder.EncodeToString([]byte(k))] = v
@@ -211,10 +213,7 @@ func encodeConsulMetadata(metadata map[string]string) map[string]string {
// nolint
func decodeConsulMetadata(metadata map[string]string) map[string]string {
- dubboMetadata := make(map[string]string, 8)
- if metadata == nil {
- return dubboMetadata
- }
+ dubboMetadata := make(map[string]string, len(metadata))
encoder := base64.RawStdEncoding
for k, v := range metadata {
kBytes, err := encoder.DecodeString(k)
@@ -305,9 +304,9 @@ func (csd *consulServiceDiscovery) GetRequestInstances(serviceNames []string, of
func (csd *consulServiceDiscovery) AddListener(listener *registry.ServiceInstancesChangedListener) error {
params := make(map[string]interface{}, 8)
- params["type"] = "service"
- params["service"] = listener.ServiceName
- params["passingonly"] = true
+ params[watch_type] = watch_type_service
+ params[watch_service] = listener.ServiceName
+ params[watch_passingonly] = watch_passingonly_true
plan, err := watch.Parse(params)
if err != nil {
logger.Errorf("add listener for service %s,error:%v", listener.ServiceName, err)
diff --git a/registry/servicediscovery/service_discovery_registry.go b/registry/servicediscovery/service_discovery_registry.go
index 52006b2bb..7576804eb 100644
--- a/registry/servicediscovery/service_discovery_registry.go
+++ b/registry/servicediscovery/service_discovery_registry.go
@@ -124,8 +124,7 @@ func creatServiceDiscovery(url *common.URL) (registry.ServiceDiscovery, error) {
if err != nil {
return nil, perrors.WithMessage(err, "Create service discovery fialed")
}
- serviceDiscovery := event.NewEventPublishingServiceDiscovery(originServiceDiscovery)
- return serviceDiscovery, nil
+ return event.NewEventPublishingServiceDiscovery(originServiceDiscovery), nil
}
func parseServices(literalServices string) *gxset.HashSet {
--
GitLab