diff --git a/src/main/java/com/serliunx/ddns/config/AbstractConfiguration.java b/src/main/java/com/serliunx/ddns/config/AbstractConfiguration.java index c54ff2b..0e0e2c1 100644 --- a/src/main/java/com/serliunx/ddns/config/AbstractConfiguration.java +++ b/src/main/java/com/serliunx/ddns/config/AbstractConfiguration.java @@ -17,7 +17,7 @@ import java.util.concurrent.locks.ReentrantLock; */ public abstract class AbstractConfiguration implements Configuration { - private static final Logger log = LoggerFactory.getLogger(AbstractConfiguration.class); + protected final Logger log = LoggerFactory.getLogger(this.getClass()); protected final Map valueMap = new LinkedHashMap<>(16); private final Lock loadLock = new ReentrantLock(); diff --git a/src/main/java/com/serliunx/ddns/config/ConfigurationKeys.java b/src/main/java/com/serliunx/ddns/config/ConfigurationKeys.java index 09ed943..a7b2fd0 100644 --- a/src/main/java/com/serliunx/ddns/config/ConfigurationKeys.java +++ b/src/main/java/com/serliunx/ddns/config/ConfigurationKeys.java @@ -8,7 +8,7 @@ package com.serliunx.ddns.config; */ public final class ConfigurationKeys { - private ConfigurationKeys(){throw new UnsupportedOperationException();} + private ConfigurationKeys() {throw new UnsupportedOperationException();} /** * 线程池核心线程数量 diff --git a/src/main/java/com/serliunx/ddns/config/PropertiesConfiguration.java b/src/main/java/com/serliunx/ddns/config/PropertiesConfiguration.java index 0e453f5..bd14905 100644 --- a/src/main/java/com/serliunx/ddns/config/PropertiesConfiguration.java +++ b/src/main/java/com/serliunx/ddns/config/PropertiesConfiguration.java @@ -1,8 +1,5 @@ package com.serliunx.ddns.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; @@ -19,8 +16,6 @@ import java.util.Set; */ public class PropertiesConfiguration extends FileConfiguration { - private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesConfiguration.class); - private Properties properties; public PropertiesConfiguration(String path) { @@ -42,13 +37,13 @@ public class PropertiesConfiguration extends FileConfiguration { // 载入配置信息 load(); } catch (IOException e) { - LOGGER.error("配置文件读取出现异常 => {}", e.toString()); + log.error("配置文件读取出现异常 => {}", e.toString()); }finally { if(inputStream != null){ try { inputStream.close(); } catch (IOException e) { - LOGGER.error("配置文件资源释放出现异常 => {}", e.getMessage()); + log.error("配置文件资源释放出现异常 => {}", e.getMessage()); } } } diff --git a/src/main/java/com/serliunx/ddns/core/context/AbstractInstanceContext.java b/src/main/java/com/serliunx/ddns/core/context/AbstractInstanceContext.java index cdd3605..35cff54 100644 --- a/src/main/java/com/serliunx/ddns/core/context/AbstractInstanceContext.java +++ b/src/main/java/com/serliunx/ddns/core/context/AbstractInstanceContext.java @@ -25,7 +25,7 @@ import static com.serliunx.ddns.util.InstanceUtils.validateInstance; */ public abstract class AbstractInstanceContext implements InstanceContext, MultipleSourceInstanceContext { - private final Logger log = LoggerFactory.getLogger(this.getClass()); + protected final Logger log = LoggerFactory.getLogger(this.getClass()); private final Set listableInstanceFactories = new HashSet<>(); diff --git a/src/main/java/com/serliunx/ddns/core/instance/AbstractInstance.java b/src/main/java/com/serliunx/ddns/core/instance/AbstractInstance.java index f1829f8..6f31033 100644 --- a/src/main/java/com/serliunx/ddns/core/instance/AbstractInstance.java +++ b/src/main/java/com/serliunx/ddns/core/instance/AbstractInstance.java @@ -23,7 +23,7 @@ import static com.serliunx.ddns.constant.SystemConstants.XML_ROOT_INSTANCE_NAME; @JacksonXmlRootElement(localName = XML_ROOT_INSTANCE_NAME) public abstract class AbstractInstance implements Instance { - private final Logger log = LoggerFactory.getLogger(this.getClass()); + protected final Logger log = LoggerFactory.getLogger(this.getClass()); /** * 实例名称 diff --git a/src/main/java/com/serliunx/ddns/core/instance/AliyunInstance.java b/src/main/java/com/serliunx/ddns/core/instance/AliyunInstance.java index 8e921c9..162d737 100644 --- a/src/main/java/com/serliunx/ddns/core/instance/AliyunInstance.java +++ b/src/main/java/com/serliunx/ddns/core/instance/AliyunInstance.java @@ -29,8 +29,6 @@ import static com.serliunx.ddns.constant.SystemConstants.XML_ROOT_INSTANCE_NAME; @JacksonXmlRootElement(localName = XML_ROOT_INSTANCE_NAME) public class AliyunInstance extends AbstractInstance { - private static final Logger log = LoggerFactory.getLogger(AliyunInstance.class); - /** * AccessKey ID */ diff --git a/src/main/java/com/serliunx/ddns/support/NetworkContextHolder.java b/src/main/java/com/serliunx/ddns/support/NetworkContextHolder.java index a7ca1b1..5f7a5e2 100644 --- a/src/main/java/com/serliunx/ddns/support/NetworkContextHolder.java +++ b/src/main/java/com/serliunx/ddns/support/NetworkContextHolder.java @@ -24,26 +24,26 @@ public final class NetworkContextHolder { private static final Integer IP_CONTEXT_TIME_OUT = 5; private static volatile String IP_ADDRESS; - private NetworkContextHolder(){throw new UnsupportedOperationException();} + private NetworkContextHolder() {throw new UnsupportedOperationException();} public static void setIpAddress(String i) { try { IP_LOCK.lock(); IP_ADDRESS = i; - if(IP_CONTEXT_WAIT_LATCH.getCount() > 0){ + if (IP_CONTEXT_WAIT_LATCH.getCount() > 0) { IP_CONTEXT_WAIT_LATCH.countDown(); } - }finally { + } finally { IP_LOCK.unlock(); } } public static String getIpAddress() { - if(IP_ADDRESS != null) { + if (IP_ADDRESS != null) { return IP_ADDRESS; } try { - if(!IP_CONTEXT_WAIT_LATCH.await(IP_CONTEXT_TIME_OUT, TimeUnit.SECONDS)) { + if (!IP_CONTEXT_WAIT_LATCH.await(IP_CONTEXT_TIME_OUT, TimeUnit.SECONDS)) { log.error("IP地址获取超时."); return null; }