lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-24 18:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-03-09 11:58:37 +08:00
parent c8f71a4bd2
commit 9fb3a0dba4
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hutool-log/pom.xml
View File

@ -26,6 +26,7 @@
<log4j2.version>2.19.0</log4j2.version>
<commons-logging.version>1.2</commons-logging.version>
<tinylog.version>1.3.6</tinylog.version>
<tinylog2.version>2.6.0</tinylog2.version>
<!-- 固定3.4.x，支持到jdk8 -->
<jboss-logging.version>3.4.3.Final</jboss-logging.version>
<logtube.version>0.44.3</logtube.version>
@ -78,7 +79,7 @@
<dependency>
<groupId>org.tinylog</groupId>
<artifactId>tinylog-api</artifactId>
<version>2.5.0</version>
<version>${tinylog2.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@ -104,7 +105,7 @@
<dependency>
<groupId>org.tinylog</groupId>
<artifactId>tinylog-impl</artifactId>
<version>2.5.0</version>
<version>${tinylog2.version}</version>
<scope>test</scope>
</dependency>
<dependency>

67
hutool-log/src/main/java/cn/hutool/log/dialect/tinylog/TinyLog.java
View File

@ -12,22 +12,33 @@ import cn.hutool.log.AbstractLog;
* <a href="http://www.tinylog.org/">tinylog</a> log.<br>
*
* @author Looly
*
*/
public class TinyLog extends AbstractLog {
private static final long serialVersionUID = -4848042277045993735L;
/** 堆栈增加层数，因为封装因此多了两层，此值用于正确获取当前类名 */
/**
* 堆栈增加层数，因为封装因此多了两层，此值用于正确获取当前类名
*/
private static final int DEPTH = 4;
private final int level;
private final String name;
/**
* 构造
*
* @param clazz 类
*/
// ------------------------------------------------------------------------- Constructor
public TinyLog(final Class<?> clazz) {
this(null == clazz ? StrUtil.NULL : clazz.getName());
}
/**
* 构造
*
* @param name 日志名
*/
public TinyLog(final String name) {
this.name = name;
this.level = Logger.getLevel(name).ordinal();
@ -59,6 +70,7 @@ public class TinyLog extends AbstractLog {
public void debug(final String fqcn, final Throwable t, final String format, final Object... arguments) {
logIfEnabled(fqcn, Level.DEBUG, t, format, arguments);
}
// ------------------------------------------------------------------------- Info
@Override
public boolean isInfoEnabled() {
@ -105,15 +117,16 @@ public class TinyLog extends AbstractLog {
/**
* 在对应日志级别打开情况下打印日志
* @param fqcn 完全限定类名(Fully Qualified Class Name)，用于定位日志位置
* @param level 日志级别
* @param t 异常，null则检查最后一个参数是否为Throwable类型，是则取之，否则不打印堆栈
* @param format 日志消息模板
*
* @param fqcn 完全限定类名(Fully Qualified Class Name)，用于定位日志位置
* @param level 日志级别
* @param t 异常，null则检查最后一个参数是否为Throwable类型，是则取之，否则不打印堆栈
* @param format 日志消息模板
* @param arguments 日志消息参数
*/
private void logIfEnabled(final String fqcn, final Level level, Throwable t, final String format, final Object... arguments) {
// fqcn 无效
if(null == t){
if (null == t) {
t = getLastArgumentIfThrowable(arguments);
}
LogEntryForwarder.forward(DEPTH, level, t, StrUtil.toString(format), arguments);
@ -129,26 +142,26 @@ public class TinyLog extends AbstractLog {
private Level toTinyLevel(final cn.hutool.log.level.Level level) {
final Level tinyLevel;
switch (level) {
case TRACE:
tinyLevel = Level.TRACE;
break;
case DEBUG:
tinyLevel = Level.DEBUG;
break;
case INFO:
tinyLevel = Level.INFO;
break;
case WARN:
tinyLevel = Level.WARNING;
break;
case ERROR:
tinyLevel = Level.ERROR;
break;
case OFF:
tinyLevel = Level.OFF;
break;
default:
throw new Error(StrUtil.format("Can not identify level: {}", level));
case TRACE:
tinyLevel = Level.TRACE;
break;
case DEBUG:
tinyLevel = Level.DEBUG;
break;
case INFO:
tinyLevel = Level.INFO;
break;
case WARN:
tinyLevel = Level.WARNING;
break;
case ERROR:
tinyLevel = Level.ERROR;
break;
case OFF:
tinyLevel = Level.OFF;
break;
default:
throw new Error(StrUtil.format("Can not identify level: {}", level));
}
return tinyLevel;
}

2
hutool-log/src/main/resources/META-INF/services/cn.hutool.log.LogFactory
View File

@ -3,6 +3,6 @@ cn.hutool.log.dialect.slf4j.Slf4jLogFactory
cn.hutool.log.dialect.log4j2.Log4j2LogFactory
cn.hutool.log.dialect.log4j.Log4jLogFactory
cn.hutool.log.dialect.commons.ApacheCommonsLogFactory
cn.hutool.log.dialect.tinylog.TinyLogFactory
cn.hutool.log.dialect.tinylog.TinyLog2Factory
cn.hutool.log.dialect.tinylog.TinyLogFactory
cn.hutool.log.dialect.jboss.JbossLogFactory