Improve error handling

Signed-off-by: Dmitry Sulman <[email protected]>

Author: dmitrysulman

logback-access-reactor-netty/src/main/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyAccessLogFactory.kt

@@ -140,37 +140,43 @@ class ReactorNettyAccessLogFactory : AccessLogFactory {
             addStatus(InfoStatus("Done configuring", this::class.java.simpleName))
         } catch (e: Exception) {
             addStatus(ErrorStatus("Failed to configure ReactorNettyAccessLogFactory", this::class.java.simpleName, e))
+            throw e
         }
         if (!debug) {
             StatusPrinter2().printInCaseOfErrorsOrWarnings(accessContext)
         }
     }
 
     private fun getDefaultConfig(): URL? {
-        return try {
-            val fileNameFromSystemProperty =
-                System.getProperty(CONFIG_FILE_NAME_PROPERTY)?.also {
-                    addStatus(
-                        InfoStatus(
-                            "Found system property [$CONFIG_FILE_NAME_PROPERTY] value: [$it]",
-                            this::class.java.simpleName,
-                        ),
-                    )
-                }
-            val fileName =
-                fileNameFromSystemProperty ?: run {
-                    addStatus(
-                        InfoStatus(
-                            "No system property [$CONFIG_FILE_NAME_PROPERTY] provided, checking [$DEFAULT_CONFIG_FILE_NAME]",
-                            this::class.java.simpleName,
-                        ),
-                    )
-                    DEFAULT_CONFIG_FILE_NAME
-                }
-            getConfigFromFileName(fileName)
-        } catch (e: FileNotFoundException) {
-            addStatus(WarnStatus(e.message, this::class.java.simpleName))
-            return null
+        val fileNameFromSystemProperty =
+            System.getProperty(CONFIG_FILE_NAME_PROPERTY)?.also {
+                addStatus(
+                    InfoStatus(
+                        "Found system property [$CONFIG_FILE_NAME_PROPERTY] value: [$it]",
+                        this::class.java.simpleName,
+                    ),
+                )
+            }
+        return if (fileNameFromSystemProperty != null) {
+            try {
+                getConfigFromFileName(fileNameFromSystemProperty)
+            } catch (e: FileNotFoundException) {
+                addStatus(ErrorStatus(e.message, this::class.java.simpleName))
+                throw e
+            }
+        } else {
+            addStatus(
+                InfoStatus(
+                    "No system property [$CONFIG_FILE_NAME_PROPERTY] provided, checking [$DEFAULT_CONFIG_FILE_NAME]",
+                    this::class.java.simpleName,
+                ),
+            )
+            try {
+                getConfigFromFileName(DEFAULT_CONFIG_FILE_NAME)
+            } catch (e: FileNotFoundException) {
+                addStatus(WarnStatus(e.message, this::class.java.simpleName))
+                null
+            }
         }
     }
 

logback-access-reactor-netty/src/test/kotlin/io/github/dmitrysulman/logback/access/reactor/netty/ReactorNettyAccessLogFactoryTests.kt

@@ -1,16 +1,24 @@
 package io.github.dmitrysulman.logback.access.reactor.netty
 
 import ch.qos.logback.access.common.joran.JoranConfigurator
+import ch.qos.logback.core.joran.spi.JoranException
 import ch.qos.logback.core.status.OnConsoleStatusListener
+import ch.qos.logback.core.status.Status
 import io.github.dmitrysulman.logback.access.reactor.netty.ReactorNettyAccessLogFactory.Companion.CONFIG_FILE_NAME_PROPERTY
+import io.github.dmitrysulman.logback.access.reactor.netty.ReactorNettyAccessLogFactory.Companion.DEFAULT_CONFIG_FILE_NAME
 import io.github.dmitrysulman.logback.access.reactor.netty.integration.EventCaptureAppender
 import io.kotest.assertions.throwables.shouldThrowExactly
-import io.kotest.matchers.booleans.shouldBeFalse
 import io.kotest.matchers.booleans.shouldBeTrue
+import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.types.shouldBeTypeOf
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
 import org.junit.jupiter.api.Test
 import java.io.FileNotFoundException
+import java.net.URL
 
 class ReactorNettyAccessLogFactoryTests {
     @Test
@@ -96,18 +104,53 @@ class ReactorNettyAccessLogFactoryTests {
             }.shouldBeTrue()
     }
 
+    @Test
+    fun `test not existing file url from constructor parameter`() {
+        shouldThrowExactly<JoranException> { ReactorNettyAccessLogFactory(URL("file:logback-access-not-exist.xml")) }
+    }
+
     @Test
     fun `test not existing filename from configuration property`() {
         System.setProperty(CONFIG_FILE_NAME_PROPERTY, "logback-access-not-exist.xml")
-        val reactorNettyAccessLogFactory = ReactorNettyAccessLogFactory()
-        reactorNettyAccessLogFactory.accessContext
-            .iteratorForAppenders()
-            .hasNext()
-            .shouldBeFalse()
+        shouldThrowExactly<FileNotFoundException> { ReactorNettyAccessLogFactory() }
     }
 
     @Test
     fun `test not existing filename from constructor parameter`() {
         shouldThrowExactly<FileNotFoundException> { ReactorNettyAccessLogFactory("logback-access-not-exist.xml") }
     }
+
+    @Test
+    fun `test not existing default config file`() {
+        val reactorNettyAccessLogFactory = spyk<ReactorNettyAccessLogFactory>(recordPrivateCalls = true)
+        every { reactorNettyAccessLogFactory["getConfigFromFileName"](DEFAULT_CONFIG_FILE_NAME) } throws FileNotFoundException()
+        val getDefaultConfigMethod = reactorNettyAccessLogFactory::class.java.getDeclaredMethod("getDefaultConfig")
+        getDefaultConfigMethod.trySetAccessible()
+        val defaultConfigUrl = getDefaultConfigMethod.invoke(reactorNettyAccessLogFactory) as URL?
+        defaultConfigUrl.shouldBeNull()
+    }
+
+    @Test
+    fun `test initialization without config`() {
+        val reactorNettyAccessLogFactory = ReactorNettyAccessLogFactory()
+        val joranConfigurator = mockk<JoranConfigurator>(relaxed = true)
+        val initializeMethod =
+            reactorNettyAccessLogFactory::class.java.getDeclaredMethod(
+                "initialize",
+                URL::class.java,
+                JoranConfigurator::class.java,
+                Boolean::class.java,
+            )
+        initializeMethod.trySetAccessible()
+        initializeMethod.invoke(reactorNettyAccessLogFactory, null, joranConfigurator, false)
+
+        verify(exactly = 0) { joranConfigurator.context }
+        verify(exactly = 0) { joranConfigurator.doConfigure(any<URL>()) }
+
+        reactorNettyAccessLogFactory.accessContext.statusManager.copyOfStatusList
+            .any {
+                it.effectiveLevel == Status.WARN &&
+                    it.message == "No configuration file provided, skipping configuration"
+            }.shouldBeTrue()
+    }
 }