Merge pull request #2 from mitchtreece/dev

1.2.0 Release

Author: mitchtreece

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Mitch Treece
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Sources/Lumberjack/Logger/Logger.swift

@@ -88,8 +88,6 @@ public class Logger: Equatable {
         let defaultComponents = Lumberjack.defaultLogger.configuration.components
         let components = Lumberjack.forceDefaultComponents ? defaultComponents : self.configuration.components
         let category = category ?? self.configuration.category
-        let module = file.components(separatedBy: "/").first ?? "???"
-        let fileWithExtension = file.components(separatedBy: "/").last ?? "???"
 
         var _message = Message(
             message,
@@ -98,9 +96,8 @@ public class Logger: Equatable {
             level: level,
             symbol: symbol ?? self.configuration.symbol.asString(for: level),
             category: category,
-            module: module,
-            fileWithExtension: fileWithExtension,
-            functionWithParameters: function,
+            file: file,
+            function: function,
             line: line,
             date: Date(),
             dateFormatter: self.configuration.dateFormatter
@@ -149,6 +146,27 @@ public class Logger: Equatable {
 
     }
 
+    /// Proxy-logs a message produced by another logger.
+    ///
+    /// - Parameters:
+    ///   - message: The message to log.
+    ///
+    /// - Returns: The logged message.
+    @discardableResult
+    public func proxy(_ message: Message) -> Message {
+        
+        return log(
+            message.body(formatted: false),
+            level: message.level,
+            symbol: message.symbol,
+            category: message.category,
+            file: message.file,
+            function: message.function,
+            line: message.line
+        )
+        
+    }
+    
     /// Logs a debug message.
     ///
     /// - Parameters:

Sources/Lumberjack/Lumberjack.swift

@@ -284,6 +284,37 @@ public func LOG(_ message: String,
 
 }
 
+/// Proxy-logs a message produced by another logger.
+///
+/// - Parameters:
+///   - message: The message to log.
+///   - target: The target to send the message to.
+///
+/// - Returns: The logged message, or `nil` if the target is invalid.
+@discardableResult
+public func PROXY(_ message: Message,
+                  target: LogTarget = .default) -> Message? {
+    
+    var logger: Logger?
+    
+    switch target {
+    case .default:
+        
+        logger = Lumberjack
+            .defaultLogger
+        
+    case .id(let id):
+        
+        logger = Lumberjack
+            .logger(id: id)
+        
+    }
+    
+    return logger?
+        .proxy(message)
+    
+}
+
 /// Logs a debug message.
 ///
 /// - Parameters:

Sources/Lumberjack/Message/Message.swift

@@ -54,15 +54,21 @@ public struct Message {
     /// The message's category.
     public let category: String?
 
-    /// The message's module.
-    public let module: String
-
     /// The message's line number.
     public let line: UInt
 
     /// The message's date.
     public let date: Date
 
+    /// The message's module.
+    public var module: String {
+        
+        return self.file
+            .components(separatedBy: "/")
+            .first ?? "???"
+        
+    }
+    
     /// The message's date as a formatted string.
     public var dateString: String {
 
@@ -105,22 +111,30 @@ public struct Message {
         return "\(route) ➜ \(status)"
 
     }
-            
+    
     private let body: String
-    private let fileWithExtension: String
-    private let functionWithParameters: String
+    internal let file: String
+    internal let function: String
+    
+    private var fileWithExtension: String {
+        
+        return self.file
+            .components(separatedBy: "/")
+            .last ?? "???"
+        
+    }
+    
     private let dateFormatter: DateFormatter
     private var hooks = [HookEntry]()
-
+    
     internal init(_ body: String,
                   loggerId: String,
                   components: [Component],
                   level: LogLevel,
                   symbol: String,
                   category: String?,
-                  module: String,
-                  fileWithExtension: String,
-                  functionWithParameters: String,
+                  file: String,
+                  function: String,
                   line: UInt,
                   date: Date,
                   dateFormatter: DateFormatter) {
@@ -133,9 +147,8 @@ public struct Message {
         self.symbol = symbol
         self.category = category
 
-        self.module = module
-        self.fileWithExtension = fileWithExtension
-        self.functionWithParameters = functionWithParameters
+        self.file = file
+        self.function = function
         self.line = line
 
         self.date = date
@@ -173,13 +186,13 @@ public struct Message {
 
         guard parameters else {
 
-            return self.functionWithParameters
+            return self.function
                 .components(separatedBy: "(")
                 .first ?? "???"
 
         }
 
-        return self.functionWithParameters
+        return self.function
 
     }