mirror of
https://github.com/mamoe/mirai.git
synced 2025-03-03 15:10:14 +08:00
logger fixed
This commit is contained in:
parent
c7584c2d68
commit
0fc7b8cf83
@ -1,6 +0,0 @@
|
||||
module mirai_core {
|
||||
requires kotlin.stdlib;
|
||||
requires lombok;
|
||||
|
||||
exports net.mamoe.mirai;
|
||||
}
|
@ -9,6 +9,7 @@ import net.mamoe.mirai.network.Protocol;
|
||||
import net.mamoe.mirai.network.Robot;
|
||||
import net.mamoe.mirai.task.MiraiTaskManager;
|
||||
import net.mamoe.mirai.utils.LoggerTextFormat;
|
||||
import net.mamoe.mirai.utils.MiraiLogger;
|
||||
import net.mamoe.mirai.utils.config.MiraiConfig;
|
||||
import net.mamoe.mirai.utils.config.MiraiMapSection;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@ -17,7 +18,6 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Scanner;
|
||||
|
||||
@Log4j2
|
||||
public class MiraiServer {
|
||||
@Getter
|
||||
private static MiraiServer instance;
|
||||
@ -40,11 +40,11 @@ public class MiraiServer {
|
||||
@Getter
|
||||
MiraiTaskManager taskManager;
|
||||
|
||||
@Getter
|
||||
MiraiLogger logger;
|
||||
|
||||
MiraiConfig setting;
|
||||
|
||||
public static Logger getLogger() {
|
||||
return log;
|
||||
}
|
||||
|
||||
protected MiraiServer(){
|
||||
instance = this;
|
||||
@ -60,6 +60,7 @@ public class MiraiServer {
|
||||
this.getEventManager().boardcastEvent(new ServerDisableEvent());
|
||||
getLogger().info(LoggerTextFormat.SKY_BLUE + "Data have been saved");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -67,6 +68,7 @@ public class MiraiServer {
|
||||
this.parentFolder = new File(System.getProperty("user.dir"));
|
||||
this.unix = !System.getProperties().getProperty("os.name").toUpperCase().contains("WINDOWS");
|
||||
|
||||
this.logger = MiraiLogger.INSTANCE;
|
||||
this.eventManager = MiraiEventManager.getInstance();
|
||||
this.taskManager = MiraiTaskManager.getInstance();
|
||||
|
||||
|
@ -14,6 +14,7 @@ import net.mamoe.mirai.network.packet.Packet
|
||||
import net.mamoe.mirai.network.packet.client.Client0825ResponsePacket
|
||||
import net.mamoe.mirai.network.packet.server.Server0825Packet
|
||||
import net.mamoe.mirai.network.packet.server.ServerPacket
|
||||
import net.mamoe.mirai.utils.MiraiLogger
|
||||
import java.net.InetSocketAddress
|
||||
|
||||
/**
|
||||
@ -22,7 +23,7 @@ import java.net.InetSocketAddress
|
||||
* @author Him188moe @ Mirai Project
|
||||
*/
|
||||
class Robot(val number: Long) {
|
||||
private lateinit var ctx: ChannelHandlerContext;
|
||||
private lateinit var ctx: ChannelHandlerContext
|
||||
|
||||
internal fun onPacketReceived(packet: Packet) {
|
||||
if (packet !is ServerPacket) {
|
||||
@ -56,7 +57,7 @@ class Robot(val number: Long) {
|
||||
ch.pipeline().addLast(object : SimpleChannelInboundHandler<ByteArray>() {
|
||||
override fun channelRead0(ctx: ChannelHandlerContext, bytes: ByteArray) {
|
||||
try {
|
||||
this@Robot.ctx = ctx;
|
||||
this@Robot.ctx = ctx
|
||||
/*val remaining = Reader.read(bytes);
|
||||
if (Reader.isPacketAvailable()) {
|
||||
robot.onPacketReceived(Reader.toServerPacket())
|
||||
@ -65,7 +66,7 @@ class Robot(val number: Long) {
|
||||
}*/
|
||||
this@Robot.onPacketReceived(ServerPacket.ofByteArray(bytes))
|
||||
} catch (e: Exception) {
|
||||
MiraiServer.getLogger().catching(e)
|
||||
MiraiLogger.catching(e)
|
||||
}
|
||||
}
|
||||
|
||||
@ -74,7 +75,7 @@ class Robot(val number: Long) {
|
||||
}
|
||||
|
||||
override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
|
||||
MiraiServer.getLogger().catching(cause)
|
||||
MiraiLogger.catching(cause)
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -102,10 +103,10 @@ class Robot(val number: Long) {
|
||||
*/
|
||||
fun read(bytes: ByteArray): ByteArray? {
|
||||
checkNotNull(this.length)
|
||||
val needSize = length!! - this.bytes.size;//How many bytes we need
|
||||
val needSize = length!! - this.bytes.size//How many bytes we need
|
||||
if (needSize == bytes.size || needSize > bytes.size) {
|
||||
this.bytes += bytes
|
||||
return null;
|
||||
return null
|
||||
}
|
||||
|
||||
//We got more than we need
|
||||
|
@ -0,0 +1,21 @@
|
||||
package net.mamoe.mirai.utils
|
||||
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.*
|
||||
|
||||
object MiraiLogger{
|
||||
fun info(o: Any) {
|
||||
this.print(o.toString())
|
||||
}
|
||||
|
||||
fun catching(e:Throwable){
|
||||
this.print(e.message)
|
||||
this.print(e.localizedMessage)
|
||||
this.print(e.cause.toString())
|
||||
}
|
||||
|
||||
private fun print(value:String?){
|
||||
val s = SimpleDateFormat("MM-dd HH:mm:ss").format(Date())
|
||||
System.out.println(LoggerTextFormat.BLUE.toString() + "[Mirai] $s : $value")
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user