From a48b9edc3d9968fbe202daee0cffd598e601ab8a Mon Sep 17 00:00:00 2001
From: william feng <>
Date: Fri, 7 Aug 2020 16:45:36 +0800
Subject: [PATCH] reduce cognitive in base_directory.go
---
cluster/directory/base_directory.go | 13 +++++--------
cluster/router/condition/router.go | 4 +---
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go
index 634cee426..7e1563a83 100644
--- a/cluster/directory/base_directory.go
+++ b/cluster/directory/base_directory.go
@@ -116,14 +116,11 @@ func (dir *BaseDirectory) isProperRouter(url *common.URL) bool {
if serviceKey == "" {
serviceKey = dir.GetUrl().SubURL.ServiceKey()
}
- if len(app) > 0 {
- if app != dir.GetUrl().GetParam(constant.APPLICATION_KEY, "") {
- return false
- }
- } else {
- if url.ServiceKey() != serviceKey {
- return false
- }
+ if len(app) > 0 && app != dir.GetUrl().GetParam(constant.APPLICATION_KEY, "") {
+ return false
+ }
+ if url.ServiceKey() != serviceKey {
+ return false
}
return true
}
diff --git a/cluster/router/condition/router.go b/cluster/router/condition/router.go
index 6be3a4fc0..800293da6 100644
--- a/cluster/router/condition/router.go
+++ b/cluster/router/condition/router.go
@@ -117,13 +117,11 @@ func NewConditionRouter(url *common.URL) (*ConditionRouter, error) {
}
router.url = url
- var defaultPriority int64
+ var defaultPriority int64 = 0
if url.GetParam(constant.APPLICATION_KEY, "") != "" {
defaultPriority = 150
} else if url.GetParam(constant.INTERFACE_KEY, "") != "" {
defaultPriority = 140
- } else {
- defaultPriority = 0
}
router.priority = url.GetParamInt(constant.RouterPriority, defaultPriority)
router.Force = url.GetParamBool(constant.RouterForce, false)
--
GitLab