github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-09 03:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Terminal] Force shutdown after double Ctrl+C

Browse Source
This commit is contained in:
Karlatemp 2022-07-22 19:30:38 +08:00
parent c38740ce2f
commit 42334c42c5
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mirai-console/frontend/mirai-console-terminal/src/MiraiConsoleTerminalLoader.kt
View File

@ -30,6 +30,7 @@ import net.mamoe.mirai.console.util.ConsoleInternalApi
import net.mamoe.mirai.message.data.Message
import net.mamoe.mirai.utils.childScope
import net.mamoe.mirai.utils.debug
import net.mamoe.mirai.utils.info
import net.mamoe.mirai.utils.verbose
import org.jline.utils.Signals
import java.io.FileDescriptor
@ -40,6 +41,7 @@ import java.util.concurrent.Executors
import java.util.concurrent.ThreadFactory
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicLong
import kotlin.system.exitProcess
/**
@ -187,17 +189,32 @@ private val shutdownSignals = arrayOf(
internal val signalHandler: (String) -> Unit = initSignalHandler()
private fun initSignalHandler(): (String) -> Unit {
val shutdownMonitorLock = AtomicBoolean(false)
val lastSignalTimestamp = AtomicLong(0)
return handler@{ signalName ->
// JLine may process other signals
MiraiConsole.mainLogger.verbose { "Received signal $signalName" }
if (signalName !in shutdownSignals) return@handler
MiraiConsole.mainLogger.debug { "Handled signal $signalName" }
kotlin.run multiSignalHandler@{
val crtTime = System.currentTimeMillis()
val last = lastSignalTimestamp.getAndSet(crtTime)
if (crtTime - last < 1000L) {
MiraiConsole.mainLogger.debug { "Multi signal $signalName" }
MiraiConsole.mainLogger.info { "Process will be killed after 0.5s" }
@OptIn(DelicateCoroutinesApi::class)
GlobalScope.launch {
delay(500L)
exitProcessAndForceHalt(-5)
}
}
}
MiraiConsole.shutdown()
// Shutdown by signal requires process be killed
if (shutdownMonitorLock.compareAndSet(false, true)) {
val pool = Executors.newFixedThreadPool(2, object : ThreadFactory {
val pool = Executors.newFixedThreadPool(4, object : ThreadFactory {
private val counter = AtomicInteger()
override fun newThread(r: Runnable): Thread {
return Thread(r, "Mirai Console Signal-Shutdown Daemon #" + counter.getAndIncrement()).also {
@ -213,6 +230,12 @@ private fun initSignalHandler(): (String) -> Unit {
// Force kill process if plugins started non-daemon threads
exitProcessAndForceHalt(-5)
}
@OptIn(DelicateCoroutinesApi::class)
GlobalScope.launch(pool.asCoroutineDispatcher()) {
delay(1000L * 60) // timed out
// Force kill process if plugins started non-daemon threads
exitProcessAndForceHalt(-5)
}
}
}
}