Merge remote-tracking branch 'origin/master' into DHIS2-18631

dhis2 · Dec 18, 2024 · 929f60c · 929f60c
2 parents 593491c + efccebc
commit 929f60c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -67,7 +67,11 @@ kotlin {
                 implementation(kotlin("test"))
             }
         }
-        val jvmMain by getting
+        val jvmMain by getting {
+            dependencies {
+                api("org.slf4j:slf4j-api:1.7.36")
+            }
+        }
         val jvmTest by getting
         val jsMain by getting {
             dependencies {

diff --git a/src/commonMain/kotlin/org/hisp/dhis/rules/engine/RuleConditionEvaluator.kt b/src/commonMain/kotlin/org/hisp/dhis/rules/engine/RuleConditionEvaluator.kt
@@ -220,6 +220,6 @@ internal class RuleConditionEvaluator {
     }
 
     companion object {
-        private val log = createLogger(RuleConditionEvaluator::class.simpleName!!)
+        private val log = createLogger("org.hisp.dhis.rules.engine.RuleConditionEvaluator")
     }
 }
diff --git a/src/jvmMain/kotlin/org/hisp/dhis/rules/Logger.kt b/src/jvmMain/kotlin/org/hisp/dhis/rules/Logger.kt
@@ -1,6 +1,8 @@
 package org.hisp.dhis.rules
 
+import org.slf4j.LoggerFactory
+
 actual fun createLogger(className: String): Logger{
-    val javaLogger = java.util.logging.Logger.getLogger(className)
-    return Logger({message -> javaLogger.severe(message)}, {message: String -> javaLogger.fine(message)})
+    val javaLogger = LoggerFactory.getLogger(className)
+    return Logger({message -> javaLogger.error(message)}, {message: String -> javaLogger.debug(message)})
 }