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
7593e348
Commit
7593e348
authored
Mar 08, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add standard output override
parent
4cd74872
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
9 deletions
+23
-9
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
...rc/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
+16
-5
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
...rc/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
+7
-4
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/MiraiLogger.kt
View file @
7593e348
...
@@ -8,10 +8,14 @@
...
@@ -8,10 +8,14 @@
*/
*/
@
file
:
Suppress
(
"unused"
)
@
file
:
Suppress
(
"unused"
)
@
file
:
JvmMultifileClass
@
file
:
JvmName
(
"Utils"
)
package
net.mamoe.mirai.utils
package
net.mamoe.mirai.utils
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.Bot
import
kotlin.jvm.JvmMultifileClass
import
kotlin.jvm.JvmName
import
kotlin.jvm.JvmOverloads
import
kotlin.jvm.JvmOverloads
...
@@ -204,7 +208,8 @@ inline fun MiraiLogger.error(lazyMessage: () -> String?, e: Throwable?) {
...
@@ -204,7 +208,8 @@ inline fun MiraiLogger.error(lazyMessage: () -> String?, e: Throwable?) {
*
*
* 不应该直接构造这个类的实例. 请使用 [DefaultLogger], 或使用默认的顶层日志记录 [MiraiLogger.Companion]
* 不应该直接构造这个类的实例. 请使用 [DefaultLogger], 或使用默认的顶层日志记录 [MiraiLogger.Companion]
*/
*/
expect
open
class
PlatformLogger
@JvmOverloads
internal
constructor
(
identity
:
String
?
=
"Mirai"
)
:
MiraiLoggerPlatformBase
expect
open
class
PlatformLogger
@JvmOverloads
constructor
(
identity
:
String
?
=
"Mirai"
)
:
MiraiLoggerPlatformBase
/**
/**
* 不做任何事情的 logger, keep silent.
* 不做任何事情的 logger, keep silent.
...
@@ -237,14 +242,19 @@ class SimpleLogger(
...
@@ -237,14 +242,19 @@ class SimpleLogger(
}
}
companion
object
{
companion
object
{
inline
operator
fun
invoke
(
crossinline
logger
:
(
message
:
String
?,
e
:
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
null
,
logger
)
inline
operator
fun
invoke
(
crossinline
logger
:
(
message
:
String
?,
e
:
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
null
,
logger
)
inline
operator
fun
invoke
(
identity
:
String
?,
crossinline
logger
:
(
message
:
String
?,
e
:
Throwable
?)
->
Unit
):
SimpleLogger
=
inline
operator
fun
invoke
(
identity
:
String
?,
crossinline
logger
:
(
message
:
String
?,
e
:
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
identity
)
{
_
,
message
,
e
->
SimpleLogger
(
identity
)
{
_
,
message
,
e
->
logger
(
message
,
e
)
logger
(
message
,
e
)
}
}
operator
fun
invoke
(
logger
:
(
priority
:
LogPriority
,
message
:
String
?,
e
:
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
null
,
logger
)
operator
fun
invoke
(
logger
:
(
priority
:
LogPriority
,
message
:
String
?,
e
:
Throwable
?)
->
Unit
):
SimpleLogger
=
SimpleLogger
(
null
,
logger
)
}
}
override
fun
verbose0
(
message
:
String
?)
=
logger
(
LogPriority
.
VERBOSE
,
message
,
null
)
override
fun
verbose0
(
message
:
String
?)
=
logger
(
LogPriority
.
VERBOSE
,
message
,
null
)
...
@@ -266,7 +276,8 @@ class SimpleLogger(
...
@@ -266,7 +276,8 @@ class SimpleLogger(
* @see disable 关闭
* @see disable 关闭
*/
*/
@Suppress
(
"MemberVisibilityCanBePrivate"
)
@Suppress
(
"MemberVisibilityCanBePrivate"
)
class
MiraiLoggerWithSwitch
internal
constructor
(
private
val
delegate
:
MiraiLogger
,
default
:
Boolean
)
:
MiraiLoggerPlatformBase
()
{
class
MiraiLoggerWithSwitch
internal
constructor
(
private
val
delegate
:
MiraiLogger
,
default
:
Boolean
)
:
MiraiLoggerPlatformBase
()
{
override
val
identity
:
String
?
get
()
=
delegate
.
identity
override
val
identity
:
String
?
get
()
=
delegate
.
identity
/**
/**
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/MiraiLoggerJvm.kt
View file @
7593e348
...
@@ -15,9 +15,12 @@ import java.util.*
...
@@ -15,9 +15,12 @@ import java.util.*
/**
/**
* JVM 控制台日志实现
* JVM 控制台日志实现
*/
*/
actual
open
class
PlatformLogger
@JvmOverloads
internal
actual
constructor
(
actual
open
class
PlatformLogger
@JvmOverloads
constructor
(
override
val
identity
:
String
?
override
val
identity
:
String
?
=
"Mirai"
,
val
output
:
(
String
)
->
Unit
)
:
MiraiLoggerPlatformBase
()
{
)
:
MiraiLoggerPlatformBase
()
{
actual
constructor
(
identity
:
String
?)
:
this
(
identity
,
::
println
)
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
())
...
@@ -52,9 +55,9 @@ actual open class PlatformLogger @JvmOverloads internal actual constructor(
...
@@ -52,9 +55,9 @@ actual open class PlatformLogger @JvmOverloads internal actual constructor(
val
time
=
SimpleDateFormat
(
"HH:mm:ss"
,
Locale
.
SIMPLIFIED_CHINESE
).
format
(
Date
())
val
time
=
SimpleDateFormat
(
"HH:mm:ss"
,
Locale
.
SIMPLIFIED_CHINESE
).
format
(
Date
())
if
(
identity
==
null
)
{
if
(
identity
==
null
)
{
println
(
"$color$time : $value"
)
output
(
"$color$time : $value"
)
}
else
{
}
else
{
println
(
"$color$identity $time : $value"
)
output
(
"$color$identity $time : $value"
)
}
}
}
}
}
}
...
...
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