Set log level from LOG_LEVEL env var

hummingbird-project · Mar 30, 2021 · 21e7c30 · 21e7c30
1 parent 66af6d7
commit 21e7c30
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/Sources/Hummingbird/Application.swift b/Sources/Hummingbird/Application.swift
@@ -65,7 +65,7 @@ public final class HBApplication: HBExtensible {
         var logger = Logger(label: "HummingBird")
         logger.logLevel = configuration.logLevel
         self.logger = logger
-        
+
         // create eventLoopGroup
         self.eventLoopGroupProvider = eventLoopGroupProvider
         switch eventLoopGroupProvider {

diff --git a/Sources/Hummingbird/Configuration.swift b/Sources/Hummingbird/Configuration.swift
@@ -43,8 +43,10 @@ extension HBApplication {
             tcpNoDelay: Bool = false,
             enableHttpPipelining: Bool = true,
             threadPoolSize: Int = 2,
-            logLevel: Logger.Level = .info
+            logLevel: Logger.Level? = nil
         ) {
+            let env = HBEnvironment()
+
             self.address = address
             self.serverName = serverName
             self.maxUploadSize = maxUploadSize
@@ -55,7 +57,14 @@ extension HBApplication {
             self.enableHttpPipelining = enableHttpPipelining
 
             self.threadPoolSize = threadPoolSize
-            self.logLevel = logLevel
+
+            if let logLevel = logLevel {
+                self.logLevel = logLevel
+            } else if let logLevel = env.get("LOG_LEVEL") {
+                self.logLevel = Logger.Level(rawValue: logLevel) ?? .info
+            } else {
+                self.logLevel = .info
+            }
         }
 
         /// return HTTP server configuration

diff --git a/Tests/HummingbirdTests/EnvironmentTests.swift b/Tests/HummingbirdTests/EnvironmentTests.swift
@@ -26,4 +26,10 @@ final class EnvironmentTests: XCTestCase {
         env.set("TEST_VAR", value: "testSet")
         XCTAssertEqual(env.get("TEST_VAR"), "testSet")
     }
+
+    func testLogLevel() {
+        setenv("LOG_LEVEL", "trace", 1)
+        let app = HBApplication()
+        XCTAssertEqual(app.logger.logLevel, .trace)
+    }
 }