github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-25 15:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support staring console-pure as a daemon

Browse Source
This commit is contained in:
Him188 2020-08-27 22:10:05 +08:00
parent 1414ff35e7
commit dad62058db
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/internal/plugin/JvmPluginInternal.kt
View File

@ -54,7 +54,7 @@ internal abstract class JvmPluginInternal(
final override val logger: MiraiLogger by lazy {
MiraiConsole.newLogger(
this._description.name
"Plugin ${this._description.name}"
)
}
@ -124,9 +124,16 @@ internal abstract class JvmPluginInternal(
@JvmField
internal val coroutineContextInitializer = {
CoroutineExceptionHandler { _, throwable -> logger.error(throwable) }
CoroutineExceptionHandler { _, throwable ->
if (throwable !is CancellationException) logger.error(throwable)
}
.plus(parentCoroutineContext)
.plus(NamedSupervisorJob("Plugin $name", parentCoroutineContext[Job]))
.plus(
NamedSupervisorJob(
"Plugin $name",
parentCoroutineContext[Job] ?: JarPluginLoaderImpl.coroutineContext[Job]!!
)
)
.also {
JarPluginLoaderImpl.coroutineContext[Job]!!.invokeOnCompletion {
this.cancel()
@ -139,7 +146,7 @@ internal abstract class JvmPluginInternal(
return coroutineContextInitializer().also { _coroutineContext = it }.also {
job.invokeOnCompletion { e ->
if (e != null) {
logger.error(e)
if (e !is CancellationException) logger.error(e)
if (this.isEnabled) safeLoader.disable(this)
}
}

4
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleImplementationPure.kt
View File

@ -38,6 +38,7 @@ import net.mamoe.mirai.console.plugin.DeferredPluginLoader
import net.mamoe.mirai.console.plugin.PluginLoader
import net.mamoe.mirai.console.plugin.jvm.JarPluginLoader
import net.mamoe.mirai.console.pure.ConsoleInputImpl.requestInput
import net.mamoe.mirai.console.util.ConsoleExperimentalAPI
import net.mamoe.mirai.console.util.ConsoleInput
import net.mamoe.mirai.console.util.ConsoleInternalAPI
import net.mamoe.mirai.utils.*
@ -60,7 +61,8 @@ import java.util.*
*
* @see MiraiConsolePureLoader CLI 入口点
*/
internal class MiraiConsoleImplementationPure
@ConsoleExperimentalAPI
class MiraiConsoleImplementationPure
@JvmOverloads constructor(
override val rootPath: Path = Paths.get("."),
override val builtInPluginLoaders: List<PluginLoader<*, *>> = Collections.unmodifiableList(

16
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt
View File

@ -20,8 +20,12 @@
package net.mamoe.mirai.console.pure
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.runBlocking
import net.mamoe.mirai.console.MiraiConsole
import net.mamoe.mirai.console.MiraiConsoleImplementation.Companion.start
import net.mamoe.mirai.console.command.ConsoleCommandSender
import net.mamoe.mirai.console.util.ConsoleExperimentalAPI
import net.mamoe.mirai.console.util.ConsoleInternalAPI
import net.mamoe.mirai.message.data.Message
import net.mamoe.mirai.utils.DefaultLogger
@ -33,11 +37,19 @@ import java.io.PrintStream
object MiraiConsolePureLoader {
@JvmStatic
fun main(args: Array<String>) {
startup()
startAsDaemon()
try {
runBlocking {
MiraiConsole.job.join()
}
} catch (e: CancellationException) {
// ignored
}
}
@Suppress("MemberVisibilityCanBePrivate")
internal fun startup(instance: MiraiConsoleImplementationPure = MiraiConsoleImplementationPure()) {
@ConsoleExperimentalAPI
fun startAsDaemon(instance: MiraiConsoleImplementationPure = MiraiConsoleImplementationPure()) {
instance.start()
overrideSTD()
startupConsoleThread()