Kotlin: Add tags to log messages (WARN, INFO, etc)

igfoo · igfoo · commit 79c2ce7f1c15 · 2022-05-10T19:51:21.000+01:00
Makes it easier to see what's going on
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt b/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
@@ -90,24 +90,29 @@ open class LoggerBase(val logCounter: LogCounter) {
         val locationId = mkLocationId()
         tw.writeDiagnostics(StarLabel(), "CodeQL Kotlin extractor", severity.sev, "", msg, "$ts $fullMsg", locationId)
         val locStr = if (locationString == null) "" else "At " + locationString + ": "
-        logStream.write("$ts Diagnostic($diagnosticLocStr): $locStr$fullMsg")
+        val kind = if (severity <= Severity.WarnHigh) "WARN" else "ERROR"
+        logStream.write("$ts [$kind] Diagnostic($diagnosticLocStr): $locStr$fullMsg")
     }
 
     fun trace(tw: TrapWriter, msg: String) {
-        debug(tw, msg)
+        if (verbosity >= 4) {
+            val fullMsg = "${timestamp()} [TRACE] $msg"
+            tw.writeComment(fullMsg)
+            logStream.write(fullMsg + "\n")
+        }
     }
 
     fun debug(tw: TrapWriter, msg: String) {
         if (verbosity >= 4) {
-            val fullMsg = "${timestamp()} $msg"
+            val fullMsg = "${timestamp()} [DEBUG] $msg"
             tw.writeComment(fullMsg)
             logStream.write(fullMsg + "\n")
         }
     }
 
     fun info(tw: TrapWriter, msg: String) {
         if (verbosity >= 3) {
-            val fullMsg = "${timestamp()} $msg"
+            val fullMsg = "${timestamp()} [INFO] $msg"
             tw.writeComment(fullMsg)
             logStream.write(fullMsg + "\n")
         }
