From 1a7c1690583b3cb9eb6eeda39e73e7449ddcb8ae Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 24 Apr 2023 13:54:47 +0800 Subject: [PATCH] remove logtube --- hutool-log/pom.xml | 10 +- .../hutool/log/engine/logtube/LogTubeLog.java | 116 ------------------ .../log/engine/logtube/LogTubeLogEngine.java | 43 ------- .../log/engine/logtube/package-info.java | 19 --- .../org.dromara.hutool.log.engine.LogEngine | 1 - 5 files changed, 2 insertions(+), 187 deletions(-) delete mode 100644 hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java delete mode 100644 hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogEngine.java delete mode 100644 hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index 631851e35..5a90cca53 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -31,9 +31,9 @@ org.dromara.hutool.log - 2.0.5 + 2.0.7 - 1.3.6 + 1.3.7 1.2.17 2.20.0 1.2 @@ -100,12 +100,6 @@ ${jboss-logging.version} true - - io.github.logtube - logtube - ${logtube.version} - true - diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java deleted file mode 100644 index bd25766ef..000000000 --- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2023 looly(loolly@aliyun.com) - * Hutool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -package org.dromara.hutool.log.engine.logtube; - -import org.dromara.hutool.core.exception.ExceptionUtil; -import org.dromara.hutool.core.text.StrUtil; -import org.dromara.hutool.log.AbstractLog; -import org.dromara.hutool.log.level.Level; -import io.github.logtube.Logtube; -import io.github.logtube.core.IEventLogger; - -/** - * LogTube log.封装
- * - * @author looly - * @since 5.6.6 - */ -public class LogTubeLog extends AbstractLog { - private static final long serialVersionUID = 1L; - - private final IEventLogger logger; - - // ------------------------------------------------------------------------- Constructor - public LogTubeLog(final IEventLogger logger) { - this.logger = logger; - } - - public LogTubeLog(final Class clazz) { - this((null == clazz) ? StrUtil.NULL : clazz.getName()); - } - - public LogTubeLog(final String name) { - this(Logtube.getLogger(name)); - } - - - @Override - public String getName() { - return logger.getName(); - } - - // ------------------------------------------------------------------------- Trace - @Override - public boolean isTraceEnabled() { - return logger.isTraceEnabled(); - } - - @Override - public void trace(final String fqcn, final Throwable t, final String format, final Object... arguments) { - log(fqcn, Level.TRACE, t, format, arguments); - } - - // ------------------------------------------------------------------------- Debug - @Override - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } - - @Override - public void debug(final String fqcn, final Throwable t, final String format, final Object... arguments) { - log(fqcn, Level.DEBUG, t, format, arguments); - } - - // ------------------------------------------------------------------------- Info - @Override - public boolean isInfoEnabled() { - return logger.isInfoEnabled(); - } - - @Override - public void info(final String fqcn, final Throwable t, final String format, final Object... arguments) { - log(fqcn, Level.INFO, t, format, arguments); - } - - // ------------------------------------------------------------------------- Warn - @Override - public boolean isWarnEnabled() { - return logger.isWarnEnabled(); - } - - @Override - public void warn(final String fqcn, final Throwable t, final String format, final Object... arguments) { - log(fqcn, Level.WARN, t, format, arguments); - } - - // ------------------------------------------------------------------------- Error - @Override - public boolean isErrorEnabled() { - return logger.isErrorEnabled(); - } - - @Override - public void error(final String fqcn, final Throwable t, final String format, final Object... arguments) { - log(fqcn, Level.ERROR, t, format, arguments); - } - - @Override - public void log(final String fqcn, final Level level, final Throwable t, final String format, final Object... arguments) { - final String topic = level.name().toLowerCase(); - logger.topic(topic) - .xStackTraceElement(ExceptionUtil.getStackElement(6), null) - .message(StrUtil.format(format, arguments)) - .xException(t) - .commit(); - } -} diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogEngine.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogEngine.java deleted file mode 100644 index ee9a66778..000000000 --- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogEngine.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2023 looly(loolly@aliyun.com) - * Hutool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -package org.dromara.hutool.log.engine.logtube; - -import org.dromara.hutool.log.AbsLogEngine; -import org.dromara.hutool.log.Log; - -/** - * LogTube log. 封装
- * - * @author Looly - */ -public class LogTubeLogEngine extends AbsLogEngine { - - /** - * 构造 - */ - public LogTubeLogEngine() { - super("LogTube"); - checkLogExist(io.github.logtube.Logtube.class); - } - - @Override - public Log createLog(final String name) { - return new LogTubeLog(name); - } - - @Override - public Log createLog(final Class clazz) { - return new LogTubeLog(clazz); - } - -} diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java deleted file mode 100644 index 5b8b60f85..000000000 --- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023 looly(loolly@aliyun.com) - * Hutool is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -/** - * LogTube的实现封装 - * - * @author looly - * - */ -package org.dromara.hutool.log.engine.logtube; diff --git a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine index 3d4116071..febe4d7cb 100644 --- a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine +++ b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.engine.LogEngine @@ -10,7 +10,6 @@ # See the Mulan PSL v2 for more details. # -org.dromara.hutool.log.engine.logtube.LogTubeLogEngine org.dromara.hutool.log.engine.slf4j.Slf4jLogEngine org.dromara.hutool.log.engine.log4j2.Log4j2LogEngine org.dromara.hutool.log.engine.log4j.Log4jLogEngine