From dd30685cf3b921723e260e50a0a4df9638ae09ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=BE=9B=E6=A0=BC?= <xg.gao@tianrang-inc.com>
Date: Thu, 19 Sep 2019 10:19:50 +0800
Subject: [PATCH] fix bug
---
common/constant/env.go | 2 +-
config/config_loader.go | 1 +
registry/nacos/registry.go | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/constant/env.go b/common/constant/env.go
index f0e4fabe0..c2bc3c4bc 100644
--- a/common/constant/env.go
+++ b/common/constant/env.go
@@ -20,5 +20,5 @@ package constant
const (
CONF_CONSUMER_FILE_PATH = "CONF_CONSUMER_FILE_PATH"
CONF_PROVIDER_FILE_PATH = "CONF_PROVIDER_FILE_PATH"
- APP_LOG_CONF_FILE string = "APP_LOG_CONF_FILE"
+ APP_LOG_CONF_FILE = "APP_LOG_CONF_FILE"
)
diff --git a/config/config_loader.go b/config/config_loader.go
index 0b48761fd..b737d3f23 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -54,6 +54,7 @@ func init() {
providerConfig = nil
}
}
+
func checkRegistries(registries map[string]*RegistryConfig, singleRegistry *RegistryConfig) {
if len(registries) == 0 && singleRegistry != nil {
registries[constant.DEFAULT_KEY] = singleRegistry
diff --git a/registry/nacos/registry.go b/registry/nacos/registry.go
index 7025b3e5d..229c6f8f0 100644
--- a/registry/nacos/registry.go
+++ b/registry/nacos/registry.go
@@ -182,7 +182,7 @@ func (nr *nacosRegistry) Subscribe(url *common.URL, notifyListener registry.Noti
listener, err := nr.subscribe(url)
if err != nil {
- if !r.IsAvailable() {
+ if !nr.IsAvailable() {
logger.Warnf("event listener game over.")
return
}
--
GitLab