From e3d9eb80fc32fce00ea21990b99323124acd6b4f Mon Sep 17 00:00:00 2001 From: Kenneth Endfinger Date: Mon, 21 Feb 2022 19:45:26 -0500 Subject: [PATCH] Heimdall: Actually set max lifetime and pool size. --- .../kubelet/foundation/heimdall/FoundationHeimdallPlugin.kt | 3 +++ .../cloud/kubelet/foundation/gjallarhorn/GjallarhornCommand.kt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/foundation-heimdall/src/main/kotlin/cloud/kubelet/foundation/heimdall/FoundationHeimdallPlugin.kt b/foundation-heimdall/src/main/kotlin/cloud/kubelet/foundation/heimdall/FoundationHeimdallPlugin.kt index 6ca7c9b..6f5b135 100644 --- a/foundation-heimdall/src/main/kotlin/cloud/kubelet/foundation/heimdall/FoundationHeimdallPlugin.kt +++ b/foundation-heimdall/src/main/kotlin/cloud/kubelet/foundation/heimdall/FoundationHeimdallPlugin.kt @@ -21,6 +21,7 @@ import org.bukkit.event.player.* import org.bukkit.plugin.java.JavaPlugin import org.jetbrains.exposed.sql.Database import org.postgresql.Driver +import java.time.Duration import java.time.Instant import java.util.* import java.util.concurrent.ConcurrentHashMap @@ -63,6 +64,8 @@ class FoundationHeimdallPlugin : JavaPlugin(), Listener { username = config.db.username password = config.db.password schema = "heimdall" + maximumPoolSize = 10 + maxLifetime = Duration.ofMinutes(10).toMillis() }) val initMigrationContent = FoundationHeimdallPlugin::class.java.getResourceAsStream( "/init.sql" diff --git a/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/GjallarhornCommand.kt b/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/GjallarhornCommand.kt index 6d08020..d220edf 100644 --- a/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/GjallarhornCommand.kt +++ b/tool-gjallarhorn/src/main/kotlin/cloud/kubelet/foundation/gjallarhorn/GjallarhornCommand.kt @@ -28,7 +28,7 @@ class GjallarhornCommand : CliktCommand(invokeWithoutSubcommand = true) { password = jdbcConnectionPassword minimumIdle = dbPoolSize / 2 maximumPoolSize = dbPoolSize - maxLifetime = Duration.ofHours(2).toMillis() + maxLifetime = Duration.ofMinutes(10).toMillis() }) val db = Database.connect(pool) currentContext.findOrSetObject { db }