diff --git a/snail-job-client/snail-job-client-common/pom.xml b/snail-job-client/snail-job-client-common/pom.xml index 3f32d0382..b9e3184f9 100644 --- a/snail-job-client/snail-job-client-common/pom.xml +++ b/snail-job-client/snail-job-client-common/pom.xml @@ -67,11 +67,6 @@ com.google.guava guava - - log4j - log4j - true - io.grpc grpc-netty-shaded diff --git a/snail-job-common/snail-job-common-log/pom.xml b/snail-job-common/snail-job-common-log/pom.xml index 444638505..a3f29edb3 100644 --- a/snail-job-common/snail-job-common-log/pom.xml +++ b/snail-job-common/snail-job-common-log/pom.xml @@ -27,11 +27,6 @@ spring-boot-starter-log4j2 true - - log4j - log4j - true - cn.hutool hutool-core diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/Log4jLog.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/Log4jLog.java deleted file mode 100644 index 3b37452cf..000000000 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/Log4jLog.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.aizuda.snailjob.common.log.dialect.log4j; - -import cn.hutool.core.util.StrUtil; -import com.aizuda.snailjob.common.log.constant.LogFieldConstants; -import com.aizuda.snailjob.common.log.dialect.AbstractLog; -import com.aizuda.snailjob.common.log.factory.LogFactory; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.MDC; - -/** - * Apache Log4J log.
- * - * @author wodeyangzipingpingwuqi - */ -public class Log4jLog extends AbstractLog { - - private static final long serialVersionUID = -6843151523380063975L; - - private final Logger logger; - - // ------------------------------------------------------------------------- Constructor - public Log4jLog(Logger logger) { - this.logger = logger; - } - - public Log4jLog(Class clazz) { - this((null == clazz) ? StrUtil.NULL : clazz.getName()); - } - - public Log4jLog(String name) { - this(Logger.getLogger(name)); - } - - @Override - public String getName() { - return logger.getName(); - } - - // ------------------------------------------------------------------------- Trace - @Override - public boolean isTraceEnabled() { - return logger.isTraceEnabled(); - } - - @Override - public void trace(Boolean remote, String fqcn, String format, Object... arguments) { - log(com.aizuda.snailjob.common.log.level.Level.TRACE, remote, fqcn, format, arguments); - } - - // ------------------------------------------------------------------------- Debug - @Override - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } - - @Override - public void debug(Boolean remote, String fqcn, String format, Object... arguments) { - log(com.aizuda.snailjob.common.log.level.Level.DEBUG, remote, fqcn, format, arguments); - } - - // ------------------------------------------------------------------------- Info - @Override - public boolean isInfoEnabled() { - return logger.isInfoEnabled(); - } - - @Override - public void info(Boolean remote, String fqcn, String format, Object... arguments) { - log(com.aizuda.snailjob.common.log.level.Level.INFO, remote, fqcn, format, arguments); - } - - // ------------------------------------------------------------------------- Warn - @Override - public boolean isWarnEnabled() { - return logger.isEnabledFor(org.apache.log4j.Level.WARN); - } - - @Override - public void warn(Boolean remote, String fqcn, String format, Object... arguments) { - log(com.aizuda.snailjob.common.log.level.Level.WARN, remote, fqcn, format, arguments); - } - - // ------------------------------------------------------------------------- Error - @Override - public boolean isErrorEnabled() { - return logger.isEnabledFor(org.apache.log4j.Level.ERROR); - } - - @Override - public void error(Boolean remote, String fqcn, String format, Object... arguments) { - log(com.aizuda.snailjob.common.log.level.Level.ERROR, remote, fqcn, format, arguments); - } - - // ------------------------------------------------------------------------- Log - @Override - public void log(com.aizuda.snailjob.common.log.level.Level level, Boolean remote, String fqcn, String format, - Object... arguments) { - org.apache.log4j.Level log4jLevel; - switch (level) { - case TRACE: - log4jLevel = org.apache.log4j.Level.TRACE; - break; - case DEBUG: - log4jLevel = org.apache.log4j.Level.DEBUG; - break; - case INFO: - log4jLevel = org.apache.log4j.Level.INFO; - break; - case WARN: - log4jLevel = org.apache.log4j.Level.WARN; - break; - case ERROR: - log4jLevel = Level.ERROR; - break; - default: - throw new Error(StrUtil.format("Can not identify level: {}", level)); - } - - if (logger.isEnabledFor(log4jLevel)) { - if (remote) { - MDC.put(LogFieldConstants.MDC_REMOTE, remote.toString()); - } - - logger.log(fqcn, log4jLevel, StrUtil.format(format, arguments), LogFactory.extractThrowable(arguments)); - } - } -} diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/Log4jLogFactory.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/Log4jLogFactory.java deleted file mode 100644 index 59d91a22f..000000000 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/Log4jLogFactory.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.aizuda.snailjob.common.log.dialect.log4j; - - -import com.aizuda.snailjob.common.log.dialect.Log; -import com.aizuda.snailjob.common.log.factory.LogFactory; - -/** - * Apache Log4J log.
- * - * @author wodeyangzipingpingwuqi - */ -public class Log4jLogFactory extends LogFactory { - - public Log4jLogFactory() { - super("Log4j"); - checkLogExist(org.apache.log4j.Logger.class); - } - - @Override - public Log createLog(String name) { - return new Log4jLog(name); - } - - @Override - public Log createLog(Class clazz) { - return new Log4jLog(clazz); - } - -} diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/package-info.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/package-info.java deleted file mode 100644 index 426f77c6a..000000000 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Log4j的实现封装 - * - * @author wodeyangzipingpingwuqi - */ -package com.aizuda.snailjob.common.log.dialect.log4j; diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/factory/GlobalLogFactory.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/factory/GlobalLogFactory.java index 3fbb903e7..e15487f7b 100644 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/factory/GlobalLogFactory.java +++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/factory/GlobalLogFactory.java @@ -1,11 +1,8 @@ package com.aizuda.snailjob.common.log.factory; -import com.aizuda.snailjob.common.log.dialect.log4j.Log4jLogFactory; import com.aizuda.snailjob.common.log.dialect.log4j2.Log4j2LogFactory; import com.aizuda.snailjob.common.log.dialect.slf4j.Slf4jLogFactory; -import org.springframework.core.env.Environment; -import java.util.Objects; /** * 全局日志工厂类
@@ -39,7 +36,6 @@ public class GlobalLogFactory { * @param logFactoryClass 日志工厂类 * @return 自定义的日志工厂类 * @see Slf4jLogFactory - * @see Log4jLogFactory * @see Log4j2LogFactory */ public static LogFactory set(Class logFactoryClass) { @@ -56,7 +52,6 @@ public class GlobalLogFactory { * @param logFactory 日志工厂类对象 * @return 自定义的日志工厂类 * @see Slf4jLogFactory - * @see Log4jLogFactory * @see Log4j2LogFactory */ public static LogFactory set(LogFactory logFactory) {