Skip to content

M
Mirai
Commit 08bdf821 authored by Him188's avatar Him188
Browse files
Options

Fix inappropriate blocking method call

parent a85c8cac
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 25 deletions
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
View file @ 08bdf821
...@@ -130,37 +130,35 @@ object MiraiConsole { ...@@ -130,37 +130,35 @@ object MiraiConsole {
val qqPassword = it[1] val qqPassword = it[1]
logger("[Bot Login]", 0, "login...") logger("[Bot Login]", 0, "login...")
try { try {
runBlocking { frontEnd.prePushBot(qqNumber)
frontEnd.prePushBot(qqNumber) val bot = Bot(qqNumber, qqPassword) {
val bot = Bot(qqNumber, qqPassword) { this.loginSolver = frontEnd.createLoginSolver()
this.loginSolver = frontEnd.createLoginSolver() this.botLoggerSupplier = {
this.botLoggerSupplier = { SimpleLogger("BOT $qqNumber]") { _, message, e ->
SimpleLogger("BOT $qqNumber]") { _, message, e -> logger("[BOT $qqNumber]", qqNumber, message)
logger("[BOT $qqNumber]", qqNumber, message) if (e != null) {
if (e != null) { logger("[NETWORK ERROR]", qqNumber, e.toString())//因为在一页 所以可以不打QQ
logger("[NETWORK ERROR]", qqNumber, e.toString())//因为在一页 所以可以不打QQ e.printStackTrace()
e.printStackTrace()
}
} }
} }
this.networkLoggerSupplier = { }
SimpleLogger("BOT $qqNumber") { _, message, e -> this.networkLoggerSupplier = {
logger("[NETWORK]", qqNumber, message)//因为在一页 所以可以不打QQ SimpleLogger("BOT $qqNumber") { _, message, e ->
if (e != null) { logger("[NETWORK]", qqNumber, message)//因为在一页 所以可以不打QQ
logger("[NETWORK ERROR]", qqNumber, e.toString())//因为在一页 所以可以不打QQ if (e != null) {
e.printStackTrace() logger("[NETWORK ERROR]", qqNumber, e.toString())//因为在一页 所以可以不打QQ
} e.printStackTrace()
} }
} }
} }
bot.login()
logger(
"[Bot Login]",
0,
"$qqNumber login successes"
)
frontEnd.pushBot(bot)
} }
bot.login()
logger(
"[Bot Login]",
0,
"$qqNumber login successes"
)
frontEnd.pushBot(bot)
} catch (e: Exception) { } catch (e: Exception) {
logger( logger(
"[Bot Login]", "[Bot Login]",
......
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