A few tweaks to the MessageFormatter interface to make them a little more palpable.

Author: Rob Murdock

kotlin-logging-js/src/main/kotlin/mu/DefaultMessageFormatter.kt

@@ -3,16 +3,16 @@ package mu
 import mu.internal.toStringSafe
 
 object DefaultMessageFormatter : MessageFormatter {
-    override fun formatMessage(level: KotlinLoggingLevel, msg: () -> Any?, loggerName: String) =
+    override fun formatMessage(level: KotlinLoggingLevel, loggerName: String, msg: () -> Any?) =
             "${level.name}: [$loggerName] ${msg.toStringSafe()}"
 
-    override fun formatMessage(level: KotlinLoggingLevel, msg: () -> Any?, t: Throwable?, loggerName: String) =
+    override fun formatMessage(level: KotlinLoggingLevel, loggerName: String, t: Throwable?, msg: () -> Any?) =
             "${level.name}: [$loggerName] ${msg.toStringSafe()}${t.throwableToString()}"
 
-    override fun formatMessage(level: KotlinLoggingLevel, marker: Marker?, msg: () -> Any?, loggerName: String) =
+    override fun formatMessage(level: KotlinLoggingLevel, loggerName: String, marker: Marker?, msg: () -> Any?) =
             "${level.name}: [$loggerName] ${marker?.getName()} ${msg.toStringSafe()}"
 
-    override fun formatMessage(level: KotlinLoggingLevel, marker: Marker?, msg: () -> Any?, t: Throwable?, loggerName: String) =
+    override fun formatMessage(level: KotlinLoggingLevel, loggerName: String, marker: Marker?, t: Throwable?, msg: () -> Any?) =
             "${level.name}: [$loggerName] ${marker?.getName()} ${msg.toStringSafe()}${t.throwableToString()}"
 
     private fun Throwable?.throwableToString(): String {

kotlin-logging-js/src/main/kotlin/mu/MessageFormatter.kt

@@ -1,8 +1,8 @@
 package mu
 
 interface MessageFormatter {
-    fun formatMessage(level: KotlinLoggingLevel, msg: () -> Any?, loggerName: String): String
-    fun formatMessage(level: KotlinLoggingLevel, msg: () -> Any?, t: Throwable?, loggerName: String): String
-    fun formatMessage(level: KotlinLoggingLevel, marker: Marker?, msg: () -> Any?, loggerName: String): String
-    fun formatMessage(level: KotlinLoggingLevel, marker: Marker?, msg: () -> Any?, t: Throwable?, loggerName: String): String
+    fun formatMessage(level: KotlinLoggingLevel, loggerName: String, msg: () -> Any?): String
+    fun formatMessage(level: KotlinLoggingLevel, loggerName: String, t: Throwable?, msg: () -> Any?): String
+    fun formatMessage(level: KotlinLoggingLevel, loggerName: String, marker: Marker?, msg: () -> Any?): String
+    fun formatMessage(level: KotlinLoggingLevel, loggerName: String, marker: Marker?, t: Throwable?, msg: () -> Any?): String
 }

kotlin-logging-js/src/main/kotlin/mu/internal/KLoggerJS.kt

@@ -51,25 +51,25 @@ internal class KLoggerJS(
 
     private fun KotlinLoggingLevel.logIfEnabled(msg: () -> Any?, logFunction: (Any?) -> Unit) {
         if (isLoggingEnabled()) {
-            logFunction(formatMessage(this, msg, loggerName))
+            logFunction(formatMessage(this, loggerName, msg))
         }
     }
 
     private fun KotlinLoggingLevel.logIfEnabled(msg: () -> Any?, t: Throwable?, logFunction: (Any?) -> Unit) {
         if (isLoggingEnabled()) {
-            logFunction(formatMessage(this, msg, t, loggerName))
+            logFunction(formatMessage(this, loggerName, t, msg))
         }
     }
 
     private fun KotlinLoggingLevel.logIfEnabled(marker: Marker?, msg: () -> Any?, logFunction: (Any?) -> Unit) {
         if (isLoggingEnabled()) {
-            logFunction(formatMessage(this, marker, msg, loggerName))
+            logFunction(formatMessage(this, loggerName, marker, msg))
         }
     }
 
     private fun KotlinLoggingLevel.logIfEnabled(marker: Marker?, msg: () -> Any?, t: Throwable?, logFunction: (Any?) -> Unit) {
         if (isLoggingEnabled()) {
-            logFunction(formatMessage(this, marker, msg, t, loggerName))
+            logFunction(formatMessage(this, loggerName, marker, t, msg))
         }
     }