Commit 615de9ef authored by liujiahua123123's avatar liujiahua123123

miraiAPI

parent 91aed96c
package net.mamoe.mirai; package net.mamoe.mirai;
import java.io.PrintStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -32,6 +33,10 @@ public class MiraiAPI { ...@@ -32,6 +33,10 @@ public class MiraiAPI {
MiraiMain.main(args); MiraiMain.main(args);
} }
public static void setLogger(PrintStream stream){
MiraiServer.getInstance().getLogger().setOutPutStream(stream);
}
public static String getMiraiVersion(){ public static String getMiraiVersion(){
return MiraiServer.MIRAI_VERSION; return MiraiServer.MIRAI_VERSION;
} }
......
...@@ -15,4 +15,7 @@ public class MiraiConsole { ...@@ -15,4 +15,7 @@ public class MiraiConsole {
} }
public void log(Object o){
System.out.println(o);
}
} }
...@@ -3,6 +3,8 @@ package net.mamoe.mirai; ...@@ -3,6 +3,8 @@ package net.mamoe.mirai;
import lombok.Getter; import lombok.Getter;
import java.io.PrintStream;
/** /**
* @author NaturalHG * @author NaturalHG
*/ */
......
...@@ -3,6 +3,7 @@ package net.mamoe.mirai.utils ...@@ -3,6 +3,7 @@ package net.mamoe.mirai.utils
import net.mamoe.mirai.Bot import net.mamoe.mirai.Bot
import net.mamoe.mirai.network.packet.ServerPacket import net.mamoe.mirai.network.packet.ServerPacket
import net.mamoe.mirai.network.packet.goto import net.mamoe.mirai.network.packet.goto
import java.io.PrintStream
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
...@@ -13,6 +14,12 @@ import java.util.* ...@@ -13,6 +14,12 @@ import java.util.*
* @author NaturalHG * @author NaturalHG
*/ */
object MiraiLogger { object MiraiLogger {
var stream:PrintStream = System.out
fun setOutPutStream(stream: PrintStream) {
this.stream = stream
}
fun log(o: Any?) = info(o) fun log(o: Any?) = info(o)
fun println(o: Any?) = info(o) fun println(o: Any?) = info(o)
fun info(o: Any?) = this.print(o.toString(), LoggerTextFormat.RESET) fun info(o: Any?) = this.print(o.toString(), LoggerTextFormat.RESET)
...@@ -28,16 +35,17 @@ object MiraiLogger { ...@@ -28,16 +35,17 @@ object MiraiLogger {
fun catching(e: Throwable) { fun catching(e: Throwable) {
e.printStackTrace() e.printStackTrace()
/* /**
this.print(e.message) this.print(e.message)
this.print(e.localizedMessage) this.print(e.localizedMessage)
this.print(e.cause.toString())*/ this.print(e.cause.toString())
*/
} }
@Synchronized @Synchronized
private fun print(value: String?, color: LoggerTextFormat = LoggerTextFormat.WHITE) { private fun print(value: String?, color: LoggerTextFormat = LoggerTextFormat.WHITE) {
val s = SimpleDateFormat("MM-dd HH:mm:ss").format(Date()) val s = SimpleDateFormat("MM-dd HH:mm:ss").format(Date())
kotlin.io.println("$color[Mirai] $s : $value") stream.println("$color[Mirai] $s : $value")
} }
} }
......
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