Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
1a4ad94d
Commit
1a4ad94d
authored
Jan 18, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify logger structure
parent
1dee5fe0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
...ain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
+1
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
...rc/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
+6
-5
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
...rc/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
+2
-4
No files found.
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/PlatformLoggerAndroid.kt
View file @
1a4ad94d
...
@@ -2,13 +2,11 @@ package net.mamoe.mirai.utils
...
@@ -2,13 +2,11 @@ package net.mamoe.mirai.utils
import
android.util.Log
import
android.util.Log
actual
typealias
PlatformLogger
=
AndroidLogger
/**
/**
* Android 平台的默认的日志记录器, 使用 [Log]
* Android 平台的默认的日志记录器, 使用 [Log]
* 不应该直接构造这个类的实例. 需使用 [DefaultLogger]
* 不应该直接构造这个类的实例. 需使用 [DefaultLogger]
*/
*/
open
class
AndroidLogger
(
override
val
identity
:
String
?
=
"Mirai"
)
:
MiraiLoggerPlatformBase
()
{
actual
open
class
PlatformLogger
actual
constructor
(
override
val
identity
:
String
?
)
:
MiraiLoggerPlatformBase
()
{
override
fun
verbose0
(
any
:
Any
?)
{
override
fun
verbose0
(
any
:
Any
?)
{
Log
.
v
(
identity
,
any
?.
toString
()
?:
""
)
Log
.
v
(
identity
,
any
?.
toString
()
?:
""
)
}
}
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
View file @
1a4ad94d
...
@@ -15,7 +15,7 @@ var DefaultLogger: (identity: String?) -> MiraiLogger = { PlatformLogger(it) }
...
@@ -15,7 +15,7 @@ var DefaultLogger: (identity: String?) -> MiraiLogger = { PlatformLogger(it) }
* 在 _JVM 控制台_ 端的实现为 [println]
* 在 _JVM 控制台_ 端的实现为 [println]
* 在 _Android_ 端的实现为 [android.util.Log]
* 在 _Android_ 端的实现为 [android.util.Log]
*
*
* 不应该直接构造这个类的实例. 请使用 [DefaultLogger]
* 不应该直接构造这个类的实例. 请使用 [DefaultLogger]
, 或使用默认的顶层日志记录 [MiraiLogger.Companion]
*/
*/
expect
open
class
PlatformLogger
@JvmOverloads
internal
constructor
(
identity
:
String
?
=
"Mirai"
)
:
MiraiLoggerPlatformBase
expect
open
class
PlatformLogger
@JvmOverloads
internal
constructor
(
identity
:
String
?
=
"Mirai"
)
:
MiraiLoggerPlatformBase
...
@@ -35,7 +35,7 @@ fun MiraiLogger.withSwitch(default: Boolean = true): MiraiLoggerWithSwitch = Mir
...
@@ -35,7 +35,7 @@ fun MiraiLogger.withSwitch(default: Boolean = true): MiraiLoggerWithSwitch = Mir
*/
*/
interface
MiraiLogger
{
interface
MiraiLogger
{
/**
/**
* 顶层日志记录器
* 顶层日志记录器
.
*/
*/
companion
object
:
MiraiLogger
by
DefaultLogger
(
"Mirai"
)
companion
object
:
MiraiLogger
by
DefaultLogger
(
"Mirai"
)
...
@@ -146,13 +146,14 @@ object SilentLogger : PlatformLogger() {
...
@@ -146,13 +146,14 @@ object SilentLogger : PlatformLogger() {
}
}
}
}
@Suppress
(
"FunctionName"
)
fun
SimpleLogger
(
logger
:
(
String
?,
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
null
,
logger
)
/**
/**
* 简易日志记录, 所有类型日志都会被重定向 [logger]
* 简易日志记录, 所有类型日志都会被重定向 [logger]
*/
*/
class
SimpleLogger
(
override
val
identity
:
String
?,
private
val
logger
:
(
String
?,
Throwable
?)
->
Unit
)
:
MiraiLoggerPlatformBase
()
{
class
SimpleLogger
(
override
val
identity
:
String
?,
private
val
logger
:
(
String
?,
Throwable
?)
->
Unit
)
:
MiraiLoggerPlatformBase
()
{
companion
object
{
operator
fun
invoke
(
logger
:
(
String
?,
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
null
,
logger
)
}
override
fun
verbose0
(
any
:
Any
?)
=
logger
(
any
?.
toString
(),
null
)
override
fun
verbose0
(
any
:
Any
?)
=
logger
(
any
?.
toString
(),
null
)
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
=
logger
(
message
,
e
)
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
=
logger
(
message
,
e
)
override
fun
debug0
(
any
:
Any
?)
=
logger
(
any
?.
toString
(),
null
)
override
fun
debug0
(
any
:
Any
?)
=
logger
(
any
?.
toString
(),
null
)
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
View file @
1a4ad94d
...
@@ -3,13 +3,11 @@ package net.mamoe.mirai.utils
...
@@ -3,13 +3,11 @@ package net.mamoe.mirai.utils
import
java.text.SimpleDateFormat
import
java.text.SimpleDateFormat
import
java.util.*
import
java.util.*
actual
typealias
PlatformLogger
=
Console
/**
/**
* JVM 控制台日志实现
* JVM 控制台日志实现
*/
*/
open
class
Console
@JvmOverloads
intern
al
constructor
(
actual
open
class
PlatformLogger
@JvmOverloads
internal
actu
al
constructor
(
override
val
identity
:
String
?
=
"Mirai"
override
val
identity
:
String
?
)
:
MiraiLoggerPlatformBase
()
{
)
:
MiraiLoggerPlatformBase
()
{
override
fun
verbose0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
RESET
)
override
fun
verbose0
(
any
:
Any
?)
=
println
(
any
,
LoggerTextFormat
.
RESET
)
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
{
override
fun
verbose0
(
message
:
String
?,
e
:
Throwable
?)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment