Rename loggerList to logWriterList in LoggerConfig (touchlab#135)

jeffdgr8 · Sep 10, 2021 · 314e41d · 314e41d
1 parent faf3d00
commit 314e41d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/kermit/src/androidTest/kotlin/co/touchlab/kermit/LogcatLoggerTest.kt b/kermit/src/androidTest/kotlin/co/touchlab/kermit/LogcatLoggerTest.kt
@@ -29,7 +29,7 @@ class LogcatLoggerTest {
 
     private val testConfig = TestConfig(
         minSeverity = Severity.Verbose,
-        loggerList = listOf(LogcatWriter()),
+        logWriterList = listOf(LogcatWriter()),
         defaultTag = DEFAULT_TAG
     )
 

diff --git a/kermit/src/commonMain/kotlin/co/touchlab/kermit/Logger.kt b/kermit/src/commonMain/kotlin/co/touchlab/kermit/Logger.kt
@@ -139,7 +139,7 @@ open class Logger(
         message: String,
         loggingCall: LogWriter.(message: String, tag: String, throwable: Throwable?) -> Unit
     ) {
-        config.loggerList.forEach {
+        config.logWriterList.forEach {
             if (it.isLoggable(severity)) {
                 it.loggingCall(message, tag, throwable)
             }
@@ -153,15 +153,15 @@ open class Logger(
         }
 
         fun setLogWriters(logWriters: List<LogWriter>) {
-            LoggerGlobal.defaultConfig.loggerList = logWriters
+            LoggerGlobal.defaultConfig.logWriterList = logWriters
         }
 
         fun setLogWriters(vararg logWriter: LogWriter) {
-            LoggerGlobal.defaultConfig.loggerList = logWriter.toList()
+            LoggerGlobal.defaultConfig.logWriterList = logWriter.toList()
         }
 
         fun addLogWriter(vararg logWriter: LogWriter) {
-            LoggerGlobal.defaultConfig.loggerList = logWriter.toList() + LoggerGlobal.defaultConfig.loggerList
+            LoggerGlobal.defaultConfig.logWriterList = logWriter.toList() + LoggerGlobal.defaultConfig.logWriterList
         }
 
         fun setDefaultTag(tag: String) {

diff --git a/kermit/src/commonMain/kotlin/co/touchlab/kermit/LoggerConfig.kt b/kermit/src/commonMain/kotlin/co/touchlab/kermit/LoggerConfig.kt
@@ -15,7 +15,7 @@ package co.touchlab.kermit
 
 interface LoggerConfig {
     val minSeverity:Severity
-    val loggerList: List<LogWriter>
+    val logWriterList: List<LogWriter>
     val defaultTag: String
     companion object {
         @Suppress("unused")
@@ -25,6 +25,6 @@ interface LoggerConfig {
 
 data class StaticConfig(
     override val minSeverity: Severity = DEFAULT_MIN_SEVERITY,
-    override val loggerList: List<LogWriter> = listOf(CommonWriter()),
+    override val logWriterList: List<LogWriter> = listOf(CommonWriter()),
     override val defaultTag: String = "Kermit"
 ): LoggerConfig
diff --git a/kermit/src/commonMain/kotlin/co/touchlab/kermit/MutableLoggerConfig.kt b/kermit/src/commonMain/kotlin/co/touchlab/kermit/MutableLoggerConfig.kt
@@ -15,6 +15,6 @@ package co.touchlab.kermit
 
 interface MutableLoggerConfig : LoggerConfig {
     override var minSeverity: Severity
-    override var loggerList: List<LogWriter>
+    override var logWriterList: List<LogWriter>
     override var defaultTag: String
 }
diff --git a/kermit/src/commonTest/kotlin/co/touchlab/kermit/KermitTest.kt b/kermit/src/commonTest/kotlin/co/touchlab/kermit/KermitTest.kt
@@ -19,13 +19,13 @@ class KermitTest {
     private val testLogWriter = TestLogWriter(loggable = Severity.Verbose)
     private val testConfig = TestConfig(
         minSeverity = Severity.Verbose,
-        loggerList = listOf(testLogWriter),
+        logWriterList = listOf(testLogWriter),
         defaultTag = "Kermit"
     )
 
     @Test
     fun defaultConfigTest() {
-        val logger = Logger(LoggerConfig.default.copy(loggerList = listOf(testLogWriter)))
+        val logger = Logger(LoggerConfig.default.copy(logWriterList = listOf(testLogWriter)))
         logger.v { "Message" }
         testLogWriter.assertCount(1)
     }
@@ -59,7 +59,7 @@ class KermitTest {
     @Test
     fun testIsLoggable() {
         val errorLogWriter = TestLogWriter(Severity.Error)
-        val logger = Logger(testConfig.copy(loggerList = listOf(errorLogWriter)))
+        val logger = Logger(testConfig.copy(logWriterList = listOf(errorLogWriter)))
 
         logger.v { "verbose" }
         logger.d { "debug" }
@@ -78,8 +78,8 @@ class KermitTest {
     @Test
     fun testMultipleLoggers() {
         val secondaryLogWriter = TestLogWriter(loggable = Severity.Verbose)
-        val loggerList = listOf(testLogWriter, secondaryLogWriter)
-        val logger = Logger(testConfig.copy(loggerList = loggerList))
+        val logWriterList = listOf(testLogWriter, secondaryLogWriter)
+        val logger = Logger(testConfig.copy(logWriterList = logWriterList))
         logger.e { "Message" }
 
         testLogWriter.assertLast { message == "Message" }

diff --git a/kermit/src/commonTest/kotlin/co/touchlab/kermit/TestLogWriter.kt b/kermit/src/commonTest/kotlin/co/touchlab/kermit/TestLogWriter.kt
@@ -19,7 +19,7 @@ import kotlin.test.assertTrue
 
 data class TestConfig(
     override val minSeverity: Severity,
-    override val loggerList: List<LogWriter>,
+    override val logWriterList: List<LogWriter>,
     override val defaultTag: String
 ) : LoggerConfig
 

diff --git a/kermit/src/jsMain/kotlin/co/touchlab/kermit/JsMutableLoggerConfig.kt b/kermit/src/jsMain/kotlin/co/touchlab/kermit/JsMutableLoggerConfig.kt
@@ -12,7 +12,7 @@ package co.touchlab.kermit
 
 internal class JsMutableLoggerConfig : MutableLoggerConfig {
     override var minSeverity: Severity = DEFAULT_MIN_SEVERITY
-    override var loggerList: List<LogWriter> = listOf(
+    override var logWriterList: List<LogWriter> = listOf(
         CommonWriter()
     )
     override var defaultTag: String = "Kermit"

diff --git a/kermit/src/jvmMain/kotlin/co/touchlab/kermit/JvmMutableLoggerConfig.kt b/kermit/src/jvmMain/kotlin/co/touchlab/kermit/JvmMutableLoggerConfig.kt
@@ -32,7 +32,7 @@ internal class JvmMutableLoggerConfig : MutableLoggerConfig {
             }
         }
 
-    override var loggerList: List<LogWriter>
+    override var logWriterList: List<LogWriter>
         get() = _loggerList
         set(value) {
             synchronized(this) {

diff --git a/kermit/src/nativeMain/kotlin/co/touchlab/kermit/KermitConfig.kt b/kermit/src/nativeMain/kotlin/co/touchlab/kermit/KermitConfig.kt
@@ -23,7 +23,7 @@ internal class AtomicMutableLoggerConfig : MutableLoggerConfig {
         set(value) {
             _minSeverity.value = value
         }
-    override var loggerList: List<LogWriter>
+    override var logWriterList: List<LogWriter>
         get() = _loggerList.value
         set(value) {
             _loggerList.value = value.freeze()