zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #317 from hxy1991/hotfix_316

Browse Source 
Fixes #316
This commit is contained in:
Keep 2018-11-20 14:39:29 +08:00 committed by GitHub
commit 9fafcda744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/src/main/java/com/alibaba/nacos/config/server/service/ServerListService.java
View File

@ -223,6 +223,12 @@ public class ServerListService implements ApplicationListener<WebServerInitializ
* @return serverlist * @return serverlist
*/ */
private List<String> getApacheServerList() { private List<String> getApacheServerList() {
if (STANDALONE_MODE) {
List<String> serverIps = new ArrayList<String>();
serverIps.add(getFormatServerAddr(LOCAL_IP));
return serverIps;
}
// 优先从文件读取服务列表 // 优先从文件读取服务列表
try { try {
List<String> serverIps = new ArrayList<String>(); List<String> serverIps = new ArrayList<String>();
@ -241,7 +247,7 @@ public class ServerListService implements ApplicationListener<WebServerInitializ
defaultLog.error("nacos-XXXX", "[serverlist] failed to get serverlist from disk!", e); defaultLog.error("nacos-XXXX", "[serverlist] failed to get serverlist from disk!", e);
} }
if (isUseAddressServer() && !STANDALONE_MODE) { if (isUseAddressServer()) {
try { try {
HttpResult result = NotifyService.invokeURL(addressServerUrl, null, null); HttpResult result = NotifyService.invokeURL(addressServerUrl, null, null);