You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2019/01/12 17:51:09 UTC
[servicecomb-service-center] 01/02: SCB-1059 Add service-center
alias
This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch metrics
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
commit 14e2845d5edd20239f32542ea98199c1d1576ce5
Author: little-cui <su...@qq.com>
AuthorDate: Mon Jan 7 17:24:53 2019 +0800
SCB-1059 Add service-center alias
---
server/core/microservice.go | 9 +++++++--
server/core/microservice_test.go | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/core/microservice.go b/server/core/microservice.go
index 9331e2c..1a45a0c 100644
--- a/server/core/microservice.go
+++ b/server/core/microservice.go
@@ -39,8 +39,9 @@ const (
REGISTRY_PROJECT = "default"
REGISTRY_DOMAIN_PROJECT = "default/default"
- REGISTRY_APP_ID = "default"
- REGISTRY_SERVICE_NAME = "SERVICECENTER"
+ REGISTRY_APP_ID = "default"
+ REGISTRY_SERVICE_NAME = "SERVICECENTER"
+ REGISTRY_SERVICE_ALIAS = "SERVICECENTER"
REGISTRY_DEFAULT_LEASE_RENEWALINTERVAL int32 = 30
REGISTRY_DEFAULT_LEASE_RETRYTIMES int32 = 3
@@ -60,6 +61,7 @@ func prepareSelfRegistration() {
Environment: pb.ENV_PROD,
AppId: REGISTRY_APP_ID,
ServiceName: REGISTRY_SERVICE_NAME,
+ Alias: REGISTRY_SERVICE_ALIAS,
Version: version.Ver().Version,
Status: pb.MS_UP,
Level: "BACK",
@@ -114,6 +116,9 @@ func IsShared(key *pb.MicroServiceKey) bool {
return false
}
_, ok := sharedServiceNames[key.ServiceName]
+ if !ok {
+ _, ok = sharedServiceNames[key.Alias]
+ }
return ok
}
diff --git a/server/core/microservice_test.go b/server/core/microservice_test.go
index edbac4c..c5133dd 100644
--- a/server/core/microservice_test.go
+++ b/server/core/microservice_test.go
@@ -75,4 +75,7 @@ func TestSetSharedMode(t *testing.T) {
if !IsShared(&proto.MicroServiceKey{Tenant: "default/default", AppId: "default", ServiceName: "shared"}) {
t.Fatalf("TestSetSharedMode failed")
}
+ if !IsShared(&proto.MicroServiceKey{Tenant: "default/default", AppId: "default", Alias: "shared"}) {
+ t.Fatalf("TestSetSharedMode failed")
+ }
}