From b8b2d9faacad2363ce8262f39a792e432ec95e3a Mon Sep 17 00:00:00 2001 From: knightliao Date: Thu, 22 Oct 2015 12:44:51 +0800 Subject: [PATCH] re --- .gitignore | 4 +++- .../java/com/baidu/disconf/client/config/DisClientConfig.java | 2 +- .../disconf/client/config/inner/DisInnerConfigHelper.java | 2 +- .../java/com/baidu/disconf/client/fetcher/FetcherFactory.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 35e1da5ca..ed0bb054d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ /.DS_Store /*-baidu.xml /log -.idea \ No newline at end of file +.idea +BCLOUD +build.sh \ No newline at end of file diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/config/DisClientConfig.java b/disconf-client/src/main/java/com/baidu/disconf/client/config/DisClientConfig.java index ac484e89b..59b61c048 100644 --- a/disconf-client/src/main/java/com/baidu/disconf/client/config/DisClientConfig.java +++ b/disconf-client/src/main/java/com/baidu/disconf/client/config/DisClientConfig.java @@ -173,7 +173,7 @@ public synchronized void loadConfig(String filePath) throws Exception { * @since 1.0.0 */ @DisInnerConfigAnnotation(name = "conf_server_url_retry_sleep_seconds", defaultValue = "2") - public int CONF_SERVER_URL_RETRY_SLEEP_SECONDS = 2; + public int confServerUrlRetrySleepSeconds = 2; public List getHostList() { return hostList; diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/config/inner/DisInnerConfigHelper.java b/disconf-client/src/main/java/com/baidu/disconf/client/config/inner/DisInnerConfigHelper.java index 478a5ea41..b6d7bdee5 100644 --- a/disconf-client/src/main/java/com/baidu/disconf/client/config/inner/DisInnerConfigHelper.java +++ b/disconf-client/src/main/java/com/baidu/disconf/client/config/inner/DisInnerConfigHelper.java @@ -109,7 +109,7 @@ public static void verifyUserConfig() throws Exception { .getInstance().CONF_SERVER_URL_RETRY_TIMES); LOGGER.debug("SERVER conf_server_url_retry_sleep_seconds: " + - DisClientConfig.getInstance().CONF_SERVER_URL_RETRY_SLEEP_SECONDS); + DisClientConfig.getInstance().confServerUrlRetrySleepSeconds); } /** diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/fetcher/FetcherFactory.java b/disconf-client/src/main/java/com/baidu/disconf/client/fetcher/FetcherFactory.java index dce2529e1..8db3fc0e6 100644 --- a/disconf-client/src/main/java/com/baidu/disconf/client/fetcher/FetcherFactory.java +++ b/disconf-client/src/main/java/com/baidu/disconf/client/fetcher/FetcherFactory.java @@ -29,7 +29,7 @@ public static FetcherMgr getFetcherMgr() throws Exception { FetcherMgr fetcherMgr = new FetcherMgrImpl(restfulMgr, DisClientConfig.getInstance().CONF_SERVER_URL_RETRY_TIMES, - DisClientConfig.getInstance().CONF_SERVER_URL_RETRY_SLEEP_SECONDS, + DisClientConfig.getInstance().confServerUrlRetrySleepSeconds, DisClientSysConfig.getInstance().ENABLE_LOCAL_DOWNLOAD_DIR_IN_CLASS_PATH, DisClientConfig.getInstance().userDefineDownloadDir, DisClientConfig.getInstance().getHostList());