Update to server translations 1.4.3

Try to finish logging actions on server stop

Author: PotatoPresident

gradle.properties

@@ -17,7 +17,7 @@ fabric_version=0.34.8+1.17
 loom_version=0.8-SNAPSHOT
 
 # Message stuff
-server_translations_version=1.4.2+1.17
+server_translations_version=1.4.3+1.17
 ekho_version=0.3.0
 
 # Kotlin

src/main/java/us/potatoboy/ledger/mixin/callbacks/ExplosionMixin.java

@@ -44,6 +44,8 @@ private void ledgerBlockExplodeCallback(
             BlockState blockState,
             Block block) {
 
+        if (blockState.isAir()) return;
+
         BlockExplodeCallback.Companion.getEVENT().invoker().explode(
                 world,
                 entity,

src/main/kotlin/us/potatoboy/ledger/Ledger.kt

@@ -2,8 +2,10 @@ package us.potatoboy.ledger
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
 import net.fabricmc.api.DedicatedServerModInitializer
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
@@ -18,6 +20,7 @@ import us.potatoboy.ledger.actionutils.ActionSearchParams
 import us.potatoboy.ledger.actionutils.Preview
 import us.potatoboy.ledger.commands.registerCommands
 import us.potatoboy.ledger.config.CONFIG_PATH
+import us.potatoboy.ledger.config.DatabaseSpec
 import us.potatoboy.ledger.config.config
 import us.potatoboy.ledger.database.DatabaseManager
 import us.potatoboy.ledger.listeners.registerBlockListeners
@@ -30,6 +33,8 @@ import java.nio.file.Files
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration
+import kotlin.time.ExperimentalTime
 
 object Ledger : DedicatedServerModInitializer, CoroutineScope {
     const val MOD_ID = "ledger"
@@ -81,9 +86,15 @@ object Ledger : DedicatedServerModInitializer, CoroutineScope {
         }
     }
 
+    @OptIn(ExperimentalTime::class)
     private fun serverStopped(server: MinecraftServer) {
         runBlocking {
-            // TODO make actions SharedFlow fully drain somehow
+            withTimeout(Duration.minutes(config[DatabaseSpec.queueTimeoutMin])) {
+                while (DatabaseManager.dbMutex.isLocked) {
+                    logInfo("Database queue is still draining. If you exit now actions WILL be lost")
+                    delay(Duration.seconds(config[DatabaseSpec.queueCheckDelaySec]))
+                }
+            }
         }
     }
 
@@ -102,5 +113,3 @@ fun logDebug(message: String) = Ledger.logger.debug(message)
 fun logInfo(message: String) = Ledger.logger.info(message)
 fun logWarn(message: String) = Ledger.logger.warn(message)
 fun logFatal(message: String) = Ledger.logger.warn(message)
-
-

src/main/kotlin/us/potatoboy/ledger/config/DatabaseSpec.kt

@@ -3,6 +3,6 @@ package us.potatoboy.ledger.config
 import com.uchuhimo.konf.ConfigSpec
 
 object DatabaseSpec : ConfigSpec() {
-    val maxQueueSize by required<Int>()
-    val queueTimeoutSec by required<Long>()
+    val queueTimeoutMin by required<Long>()
+    val queueCheckDelaySec by required<Long>()
 }

src/main/kotlin/us/potatoboy/ledger/database/DatabaseManager.kt

@@ -57,7 +57,6 @@ object DatabaseManager {
     val actions = _actions.asSharedFlow()
 
     init {
-        // TODO stop minecraft from closing while still collecting or something? not sure
         Ledger.launch {
             actions.collect {
                 execute {

src/main/resources/ledger.toml

@@ -1,8 +1,8 @@
 [database]
-# Amount of queue items to do per drain
-maxQueueSize = 50
-# Amount of time to wait for queue to reach maxQueueSize
-queueTimeoutSec = 5
+# The maximum amount of time to wait for the queue to drain when the server stops
+queueTimeoutMin = 5
+# The amount of time between checking if the queue is empty when the server stops
+queueCheckDelaySec = 10
 
 [search]
 # Number of actions to show per page