close hikariDSPool when close console

Author: StageGuard

src/main/kotlin/stageguard/sctimetable/PluginMain.kt

@@ -14,7 +14,6 @@ import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
 import net.mamoe.mirai.event.GlobalEventChannel
 import net.mamoe.mirai.event.events.BotOnlineEvent
 import net.mamoe.mirai.utils.MiraiExperimentalApi
-import net.mamoe.mirai.utils.error
 import net.mamoe.mirai.utils.info
 import org.quartz.Scheduler
 import org.quartz.impl.StdSchedulerFactory
@@ -60,5 +59,6 @@ object PluginMain : KotlinPlugin(
 
     override fun onDisable() {
         SuperCourseApiService.closeHttpClient()
+        Database.close()
     }
 }

src/main/kotlin/stageguard/sctimetable/database/Database.kt

@@ -15,6 +15,7 @@ import net.mamoe.mirai.utils.error
 import net.mamoe.mirai.utils.info
 import net.mamoe.mirai.utils.verbose
 import net.mamoe.mirai.utils.warning
+import okhttp3.internal.closeQuietly
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.Database
 import org.jetbrains.exposed.sql.statements.StatementContext
@@ -34,6 +35,7 @@ object Database {
     }
 
     private lateinit var db : Database
+    private lateinit var hikariSource: HikariDataSource
     private var connectionStatus: ConnectionStatus = ConnectionStatus.DISCONNECTED
 
     fun <T> query(block: (Transaction) -> T) : T? = if(connectionStatus == ConnectionStatus.DISCONNECTED) {
@@ -47,7 +49,9 @@ object Database {
     } else newSuspendedTransaction(context = Dispatchers.IO, db = db) { block(this) }
 
     fun connect() {
-        db = Database.connect(hikariDataSourceProvider())
+        db = Database.connect(hikariDataSourceProvider().also {
+            hikariSource = it
+        })
         connectionStatus = ConnectionStatus.CONNECTED
         PluginMain.logger.info { "Database ${PluginConfig.database.table} is connected." }
         initDatabase()
@@ -65,6 +69,11 @@ object Database {
 
     } }
 
+    fun close() {
+        connectionStatus = ConnectionStatus.DISCONNECTED
+        hikariSource.closeQuietly()
+    }
+
     private fun hikariDataSourceProvider() : HikariDataSource = HikariDataSource(HikariConfig().apply {
         when {
             PluginConfig.database.address == "" -> throw InvalidDatabaseConfigException("Database address is not set in config file ${PluginConfig.saveName}.")
@@ -84,6 +93,7 @@ object Database {
         username        = PluginConfig.database.user
         password        = PluginConfig.database.password
         maximumPoolSize = PluginConfig.database.maximumPoolSize!!
+        poolName        = "SCTimetableDB Pool"
     })
 
 }