github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-01 20:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve PlatformLogger.jvm, prints stacktrace to a specified output

Browse Source
This commit is contained in:
Him188 2020-05-21 17:52:36 +08:00
parent 6aaba6c5ae
commit 3f4dd1ec12
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/PlatformLogger.jvm.kt
View File

@ -9,6 +9,8 @@
package net.mamoe.mirai.utils package net.mamoe.mirai.utils
import java.io.ByteArrayOutputStream
import java.io.PrintStream
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@ -24,35 +26,36 @@ actual open class PlatformLogger constructor(
override fun verbose0(message: String?) = println(message, LoggerTextFormat.RESET) override fun verbose0(message: String?) = println(message, LoggerTextFormat.RESET)
override fun verbose0(message: String?, e: Throwable?) { override fun verbose0(message: String?, e: Throwable?) {
if (message != null) verbose(message.toString()) if (message != null) verbose(message.toString())
e?.printStackTrace() e?.stackTraceString?.let(output)
} }
override fun info0(message: String?) = println(message, LoggerTextFormat.LIGHT_GREEN) override fun info0(message: String?) = println(message, LoggerTextFormat.LIGHT_GREEN)
override fun info0(message: String?, e: Throwable?) { override fun info0(message: String?, e: Throwable?) {
if (message != null) info(message.toString()) if (message != null) info(message.toString())
e?.printStackTrace() e?.stackTraceString?.let(output)
} }
override fun warning0(message: String?) = println(message, LoggerTextFormat.LIGHT_RED) override fun warning0(message: String?) = println(message, LoggerTextFormat.LIGHT_RED)
override fun warning0(message: String?, e: Throwable?) { override fun warning0(message: String?, e: Throwable?) {
if (message != null) warning(message.toString()) if (message != null) warning(message.toString())
e?.printStackTrace() e?.stackTraceString?.let(output)
} }
override fun error0(message: String?) = println(message, LoggerTextFormat.RED) override fun error0(message: String?) = println(message, LoggerTextFormat.RED)
override fun error0(message: String?, e: Throwable?) { override fun error0(message: String?, e: Throwable?) {
if (message != null) error(message.toString()) if (message != null) error(message.toString())
e?.printStackTrace() e?.stackTraceString?.let(output)
} }
override fun debug0(message: String?) = println(message, LoggerTextFormat.LIGHT_CYAN) override fun debug0(message: String?) = println(message, LoggerTextFormat.LIGHT_CYAN)
override fun debug0(message: String?, e: Throwable?) { override fun debug0(message: String?, e: Throwable?) {
if (message != null) debug(message.toString()) if (message != null) debug(message.toString())
e?.printStackTrace() e?.stackTraceString?.let(output)
} }
private val format = SimpleDateFormat("HH:mm:ss", Locale.SIMPLIFIED_CHINESE)
private fun println(value: String?, color: LoggerTextFormat) { private fun println(value: String?, color: LoggerTextFormat) {
val time = SimpleDateFormat("HH:mm:ss", Locale.SIMPLIFIED_CHINESE).format(Date()) val time = format.format(Date())
if (identity == null) { if (identity == null) {
output("$color$time : $value") output("$color$time : $value")
@ -62,6 +65,11 @@ actual open class PlatformLogger constructor(
} }
} }
internal val Throwable.stackTraceString get() = ByteArrayOutputStream().run {
printStackTrace(PrintStream(this))
this.toByteArray().let(::String)
}
/** /**
* @author NaturalHG * @author NaturalHG
*/ */