github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-31 19:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure thread safe

Browse Source
This commit is contained in:
Him188 2021-11-06 14:12:38 +00:00
parent 4a488f3416
commit ef2d22c956
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mirai-core-api/src/commonMain/kotlin/internal/utils/StdoutLogger.kt
View File

@ -10,7 +10,6 @@
package net.mamoe.mirai.internal.utils package net.mamoe.mirai.internal.utils
import net.mamoe.mirai.utils.* import net.mamoe.mirai.utils.*
import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@ -102,7 +101,9 @@ internal open class StdoutLogger constructor(
else debug(message.toString()) else debug(message.toString())
} }
protected open val timeFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) protected open val timeFormat: SimpleDateFormat by threadLocal {
SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
}
private val currentTimeFormatted get() = timeFormat.format(Date()) private val currentTimeFormatted get() = timeFormat.format(Date())

9
mirai-core-api/src/jvmMain/kotlin/utils/PlatformLogger.jvm.kt
View File

@ -13,6 +13,8 @@ package net.mamoe.mirai.utils
import java.text.DateFormat import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.util.* import java.util.*
/** /**
@ -106,9 +108,12 @@ public actual open class PlatformLogger constructor( // same as StdoutLogger bu
else debug(message.toString()) else debug(message.toString())
} }
protected open val timeFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) @Deprecated("Use formatter instead.", level = DeprecationLevel.HIDDEN)
protected open val timeFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.SIMPLIFIED_CHINESE)
private val currentTimeFormatted get() = timeFormat.format(Date()) protected open val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
private val currentTimeFormatted get() = formatter.format(LocalDateTime.now())
@MiraiExperimentalApi("This is subject to change.") @MiraiExperimentalApi("This is subject to change.")
protected enum class Color(private val format: String) { protected enum class Color(private val format: String) {