Commit b2b8e120 authored by Him188's avatar Him188

Optimize internal event logs

parent f5585374
...@@ -487,12 +487,14 @@ internal class QQAndroidBotNetworkHandler(coroutineContext: CoroutineContext, bo ...@@ -487,12 +487,14 @@ internal class QQAndroidBotNetworkHandler(coroutineContext: CoroutineContext, bo
) { ) {
// highest priority: pass to listeners (attached by sendAndExpect). // highest priority: pass to listeners (attached by sendAndExpect).
if (packet != null && (bot.logger.isEnabled || logger.isEnabled)) { if (packet != null && (bot.logger.isEnabled || logger.isEnabled)) {
when (packet) { when {
is Packet.NoLog -> { packet is Packet.NoLog -> {
// nothing to do // nothing to do
} }
is MessageEvent -> packet.logMessageReceived() packet is MessageEvent -> packet.logMessageReceived()
is Event -> bot.logger.verbose { "Event: ${packet.toString().singleLine()}" } packet is Event && packet !is Packet.NoEventLog -> bot.logger.verbose {
"Event: ${packet.toString().singleLine()}"
}
else -> logger.verbose { "Recv: ${packet.toString().singleLine()}" } else -> logger.verbose { "Recv: ${packet.toString().singleLine()}" }
} }
} }
......
...@@ -40,7 +40,7 @@ internal class ConfigPushSvc { ...@@ -40,7 +40,7 @@ internal class ConfigPushSvc {
) { ) {
override val canBeCached: Boolean get() = false override val canBeCached: Boolean get() = false
sealed class PushReqResponse : Packet, Event, AbstractEvent() { sealed class PushReqResponse : Packet, Event, AbstractEvent(), Packet.NoEventLog {
class Success( class Success(
val struct: PushReqJceStruct val struct: PushReqJceStruct
) : PushReqResponse() { ) : PushReqResponse() {
......
package net.mamoe.mirai.qqandroid.network package net.mamoe.mirai.qqandroid.network
import net.mamoe.mirai.event.Event
import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.MiraiInternalAPI
/** /**
...@@ -14,4 +15,9 @@ interface Packet { ...@@ -14,4 +15,9 @@ interface Packet {
* 实现这个接口的包将不会被记录到日志中 * 实现这个接口的包将不会被记录到日志中
*/ */
interface NoLog interface NoLog
/**
* 实现这个接口的 [Event] 不会被作为事件记录到日志中
*/
interface NoEventLog
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment