1.7.1

Author: ExplodingDragon

VERSION.md

@@ -10,14 +10,18 @@
 
 ## 版本日志
 
+### 1.7.1
+
+- 缓解模块 `logger-console` 下日志输出过快导致的时间异常问题 （已在 2.0 修复）
+- 优化模块`logger-console` 下包名格式化样式
+
 ### 1.7.0
 
 - 升级 `slf4j` 到 1.7.31
 - 升级 `kotlin` 到 1.5.21
 - 升级 `gradle` 到 6.8.3
 - 优化模块 `logger-slf4j` 逻辑，现在引入此模块后不会影响项目原 `slf4j` 版本了
 
-
 ### 1.6.0
 
 - 优化 `logger-console` 日志输出样式
@@ -82,4 +86,3 @@
 ### 1.0.1
 
 第一个稳定发行版
-

logger-console/src/main/kotlin/logger4k/impl/console/ConsoleLogConfig.kt

@@ -53,30 +53,29 @@ object ConsoleLogConfig {
 
     init {
         loggerLevel = try {
-            LoggerLevel.valueOf(System.getProperty("logger.level", "INFO")!!.toUpperCase())
+            LoggerLevel.valueOf(System.getProperty("logger.level", "INFO")!!.uppercase())
         } catch (_: Exception) {
             LoggerLevel.INFO
         }
 
-        Runtime.getRuntime().addShutdownHook(Thread {
-            for (runnable in threadPool.shutdownNow()) {
-                try {
-                    runnable.run()
-                } catch (_: Exception) {
+        Runtime.getRuntime().addShutdownHook(
+            Thread {
+                for (runnable in threadPool.shutdownNow()) {
+                    try {
+                        runnable.run()
+                    } catch (_: Exception) {
+                    }
                 }
+                println("程序于 ${dateFormat.format(System.currentTimeMillis())} 退出.")
             }
-            println("程序于 ${dateFormat.format(System.currentTimeMillis())} 退出.")
-        })
+        )
     }
 
-
     internal val classNameFormat: ClassNameFormat = ClassNameFormat.DEFAULT_IMPL
 
     /**
      * logger level
      */
     internal val loggerLevelInt: Int
         get() = loggerLevel.level
-
-
 }

logger-console/src/main/kotlin/logger4k/impl/console/ConsoleLogger.kt

@@ -45,8 +45,9 @@ class ConsoleLogger(override val name: String) : SimpleLogger() {
                 ConsoleLogConfig.output
             }.println(
                 if (exception != null) format(
-                    name, date, level, threadInfo, message + "\r\n" +
-                            ThrowableUtils.format(exception)
+                    name, date, level, threadInfo,
+                    message + "\r\n" +
+                        ThrowableUtils.format(exception)
                 ) else format(
                     name,
                     date,
@@ -56,7 +57,6 @@ class ConsoleLogger(override val name: String) : SimpleLogger() {
                 )
             )
         }
-
     }
 
     private fun format(
@@ -68,7 +68,9 @@ class ConsoleLogger(override val name: String) : SimpleLogger() {
     ): String {
         val res = StringBuilder()
         res.append("")
-            .append(ConsoleLogConfig.dateFormat.format(date))
+            .append(
+                synchronized(ConsoleLogConfig.dateFormat) { ConsoleLogConfig.dateFormat.format(date) }
+            )
             .append(" - ")
             .append(formatThreadName(threadInfo))
             .append("/")
@@ -94,7 +96,6 @@ class ConsoleLogger(override val name: String) : SimpleLogger() {
         }
     }
 
-
     override fun traceOnly(function: ILogger.() -> Unit): ILogger {
         if (ConsoleLogConfig.loggerLevelInt <= LoggerLevel.TRACE.level) {
             function(this)
@@ -111,5 +112,4 @@ class ConsoleLogger(override val name: String) : SimpleLogger() {
 
     override val isDebug: Boolean
         get() = ConsoleLogConfig.loggerLevelInt <= LoggerLevel.DEBUG.level
-
 }

logger-console/src/test/kotlin/logger4k/impl/console/LoggerMainTestAll.kt

@@ -63,23 +63,19 @@ fun main() {
     logger.info("My name is {}.", "John")
     // 输出 INFO 日志
 
-
     logger.warn("Warn.")
     logger.warn("My name is {}.", "John")
     logger.warnThrowable("输出异常信息", RuntimeException("Runtime Exception"))
     // 输出 WARN 日志
 
-
     logger.error("Error.")
     logger.error("My name is {}.", "John")
     logger.errorThrowable("输出异常信息", RuntimeException("Runtime Exception"))
     // 输出 ERROR 日志
     val logger2 = LoggerFactory.getLogger(Void::class)
     logger2.info("Hello World")
-
 }
 
-
 internal class Test {
     @Test
     fun test() {

logger-console/src/test/kotlin/logger4k/impl/console/PrintLogger.kt

@@ -23,7 +23,7 @@ package logger4k.impl.console
 import com.github.openEdgn.logger4k.LoggerFactory
 import org.junit.jupiter.api.Test
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
 
 internal class PrintLogger {
     /**

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/ILogger.kt

@@ -20,7 +20,6 @@
 
 package com.github.openEdgn.logger4k
 
-
 /**
  *  # Logger 日志框架核心
  *
@@ -141,9 +140,8 @@ interface ILogger {
      */
     val isDebug: Boolean
 
-
     /**
      * # 日志输出等级
      */
     val level: LoggerLevel
-}
+}

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/LoggerConfig.kt

@@ -30,7 +30,7 @@ import java.io.PrintWriter
  */
 internal object LoggerConfig {
     fun internalError(msg: String, e: Exception? = null) {
-        if (internalDebug){
+        if (internalDebug) {
             System.err.printf("[ Logger4K internal Error] Error Message :%d \r\n", msg)
             e?.run {
                 val byteArrayOutputStream = ByteArrayOutputStream()
@@ -47,8 +47,8 @@ internal object LoggerConfig {
      */
     private val internalDebug: Boolean by lazy {
         (System.getProperty("logger4k.internal.debug", "false") ?: "false")
-                .contentEquals("true")
+            .contentEquals("true")
     }
 }
 
-fun getMessageFormat(): IMessageFormat = LoggerConfig.messageFormat
+fun getMessageFormat(): IMessageFormat = LoggerConfig.messageFormat

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/LoggerLevel.kt

@@ -50,4 +50,4 @@ enum class LoggerLevel(val level: Int) {
      * ERROR
      */
     ERROR(4),
-}
+}

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/SimpleLogger.kt

@@ -22,13 +22,11 @@ package com.github.openEdgn.logger4k
 
 import com.github.openEdgn.logger4k.plugin.PluginManager
 
-
 /**
  * 默认的 Logger 实现类
  */
 abstract class SimpleLogger : ILogger {
 
-
     abstract val name: String
     abstract fun printLogger(date: Long, level: LoggerLevel, message: String)
     abstract fun printLogger(date: Long, level: LoggerLevel, message: String, exception: Throwable)

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/format/ClassNameFormat.kt

@@ -35,5 +35,4 @@ abstract class ClassNameFormat {
     companion object {
         val DEFAULT_IMPL: ClassNameFormat = MaxLengthClassFormat()
     }
-
-}
+}

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/format/IMessageFormat.kt

@@ -32,4 +32,4 @@ package com.github.openEdgn.logger4k.format
  */
 interface IMessageFormat {
     fun format(message: String, data: Array<out Any?>): String
-}
+}

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/format/MaxLengthClassFormat.kt

@@ -22,26 +22,59 @@ package com.github.openEdgn.logger4k.format
 
 /**
  * 类名称格式化工具
- * @property maxLine Int
+ * @property maxLength Int
  */
 class MaxLengthClassFormat : ClassNameFormat() {
-    private val maxLine = 30
+    private val maxLength = 40
     override fun format(name: String): String {
-        return if (name.length > maxLine) {
-            val list = name.split(".")
-            val stringBuilder = StringBuilder()
-            for (i in 0 until list.size - 1) {
-                stringBuilder.append(list[i].first()).append(".")
+        if (maxLength == -1) {
+            return name
+        }
+        return if (name.length > maxLength) {
+            var length = name.length
+            var accept = false
+            val builder = StringBuilder()
+            val split = name.split(".")
+            if (split.size == 1) {
+                return formatLength(name, maxLength)
             }
-            if (maxLine - stringBuilder.length < list.last().length) {
-                stringBuilder.append(list.last().replace(Regex("[a-z]"), ""))
-            } else {
-                stringBuilder.append(list.last())
+            for (item in 0 until split.size - 1) {
+                if (accept) {
+                    builder.append(split[item]).append(".")
+                } else {
+                    if ((length + 2 - split[item].length) <= maxLength) {
+                        accept = true
+                    }
+                    builder.append(split[item].first()).append(".")
+                    length -= split[item].length - 2
+                }
             }
 
-            String.format("%${-maxLine}s", stringBuilder.toString())
+            val lastName = split.last()
+            if (lastName.length > maxLength - builder.length) {
+                builder.append(lastName)
+                builder.toString()
+            } else {
+                builder.append(lastName)
+                formatLength(builder.toString(), maxLength)
+            }
         } else {
-            String.format("%${-maxLine}s", name)
+            formatLength(name, maxLength)
         }
     }
+
+    private fun formatLength(data: String, len: Int): String {
+        if (len <= 0) {
+            return ""
+        }
+        val item = data.substring(
+            0,
+            if (data.length > len) {
+                len
+            } else {
+                data.length
+            }
+        )
+        return String.format("%${-len}s", item)
+    }
 }

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/format/MessageFormatImpl.kt

@@ -20,8 +20,7 @@
 
 package com.github.openEdgn.logger4k.format
 
-import java.util.*
-import kotlin.collections.ArrayList
+import java.util.LinkedList
 
 /**
  * 消息格式化类
@@ -87,4 +86,4 @@ object MessageFormatImpl : IMessageFormat {
         }
         return result.toString().replace(Regex("(\\\\\\{}|\\\\\\{\\\\})"), "{}")
     }
-}
+}

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/plugin/IPlugin.kt

@@ -55,5 +55,4 @@ interface IPlugin {
      * @return LoggerLevel 日志等级
      */
     fun getLoggerLevel(name: String): LoggerLevel
-
 }

logger-core/src/main/kotlin/com/github/openEdgn/logger4k/plugin/PluginManager.kt

@@ -22,7 +22,7 @@ package com.github.openEdgn.logger4k.plugin
 
 import com.github.openEdgn.logger4k.LoggerConfig
 import java.io.Closeable
-import java.util.*
+import java.util.Properties
 import kotlin.reflect.KClass
 import kotlin.reflect.full.createInstance
 import kotlin.reflect.full.isSubclassOf
@@ -37,7 +37,6 @@ object PluginManager : Closeable {
 
     internal fun implPlugin(): IPlugin {
         return loggerPlugin ?: throw RuntimeException("未在类路径下找到 Logger 的实现类，无法记录默认日志.")
-
     }
 
     private const val PLUGIN_IMPL_CLASS_KEY = "logger4k.plugin.implClass"
@@ -78,7 +77,6 @@ object PluginManager : Closeable {
         }
     }
 
-
     /**
      * 注册 Plugin Manager 插件
      * @param pluginClass KClass<IPlugin>
@@ -99,8 +97,6 @@ object PluginManager : Closeable {
         }
     }
 
-
     override fun close() {
-
     }
-}
+}