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
c20040f1
Commit
c20040f1
authored
Feb 19, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add common property `isEnabled` to all loggers
parent
c9375114
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
11 deletions
+19
-11
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
...rc/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
+19
-11
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
View file @
c20040f1
...
...
@@ -70,6 +70,13 @@ interface MiraiLogger {
*/
val
identity
:
String
?
/**
* 获取 [MiraiLogger] 是否已开启
*
* 除 [MiraiLoggerWithSwitch] 可控制开关外, 其他的所有 [MiraiLogger] 均一直开启.
*/
val
isEnabled
:
Boolean
/**
* 随从. 在 this 中调用所有方法后都应继续往 [follower] 传递调用.
* [follower] 的存在可以让一次日志被多个日志记录器记录.
...
...
@@ -151,43 +158,43 @@ interface MiraiLogger {
inline
fun
MiraiLogger
.
verbose
(
lazyMessage
:
()
->
String
)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
verbose
(
lazyMessage
())
if
(
isEnabled
)
verbose
(
lazyMessage
())
}
inline
fun
MiraiLogger
.
verbose
(
lazyMessage
:
()
->
String
,
e
:
Throwable
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
verbose
(
lazyMessage
(),
e
)
if
(
isEnabled
)
verbose
(
lazyMessage
(),
e
)
}
inline
fun
MiraiLogger
.
debug
(
lazyMessage
:
()
->
String
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
debug
(
lazyMessage
())
if
(
isEnabled
)
debug
(
lazyMessage
())
}
inline
fun
MiraiLogger
.
debug
(
lazyMessage
:
()
->
String
?,
e
:
Throwable
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
debug
(
lazyMessage
(),
e
)
if
(
isEnabled
)
debug
(
lazyMessage
(),
e
)
}
inline
fun
MiraiLogger
.
info
(
lazyMessage
:
()
->
String
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
info
(
lazyMessage
())
if
(
isEnabled
)
info
(
lazyMessage
())
}
inline
fun
MiraiLogger
.
info
(
lazyMessage
:
()
->
String
?,
e
:
Throwable
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
info
(
lazyMessage
(),
e
)
if
(
isEnabled
)
info
(
lazyMessage
(),
e
)
}
inline
fun
MiraiLogger
.
warning
(
lazyMessage
:
()
->
String
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
warning
(
lazyMessage
())
if
(
isEnabled
)
warning
(
lazyMessage
())
}
inline
fun
MiraiLogger
.
warning
(
lazyMessage
:
()
->
String
?,
e
:
Throwable
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
warning
(
lazyMessage
(),
e
)
if
(
isEnabled
)
warning
(
lazyMessage
(),
e
)
}
inline
fun
MiraiLogger
.
error
(
lazyMessage
:
()
->
String
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
error
(
lazyMessage
())
if
(
isEnabled
)
error
(
lazyMessage
())
}
inline
fun
MiraiLogger
.
error
(
lazyMessage
:
()
->
String
?,
e
:
Throwable
?)
{
if
(
this
!
is
MiraiLoggerWithSwitch
||
switch
)
error
(
lazyMessage
(),
e
)
if
(
isEnabled
)
error
(
lazyMessage
(),
e
)
}
/**
...
...
@@ -268,7 +275,7 @@ class MiraiLoggerWithSwitch internal constructor(private val delegate: MiraiLogg
@PublishedApi
internal
var
switch
:
Boolean
=
default
val
isEnabled
:
Boolean
get
()
=
switch
override
val
isEnabled
:
Boolean
get
()
=
switch
fun
enable
()
{
switch
=
true
...
...
@@ -298,6 +305,7 @@ class MiraiLoggerWithSwitch internal constructor(private val delegate: MiraiLogg
* 在定义 logger 变量时, 请一直使用 [MiraiLogger] 或者 [MiraiLoggerWithSwitch].
*/
abstract
class
MiraiLoggerPlatformBase
:
MiraiLogger
{
override
val
isEnabled
:
Boolean
get
()
=
true
final
override
var
follower
:
MiraiLogger
?
=
null
final
override
fun
verbose
(
message
:
String
?)
{
...
...
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