Wrap OSLog on my own instead of depending on a third party

Author: nevyn

…s/allonet2/PlaceServer/LoggerStore.swift …urces/allonet2/Logging/LoggerStore.swiftSources/allonet2/PlaceServer/LoggerStore.swift renamed to Sources/allonet2/Logging/LoggerStore.swift Sources/allonet2/PlaceServer/LoggerStore.swift renamed to Sources/allonet2/Logging/LoggerStore.swift

@@ -0,0 +1,25 @@
+//
+//  LoggingUtil.swift
+//  allonet2
+//
+//  Created by Nevyn Bengtsson on 2025-11-18.
+//
+
+import Logging
+
+extension Logger
+{
+    public func forClient(_ cid: ClientId) -> Logger
+    {
+        var clientLogger = self
+        clientLogger[metadataKey: "clientId"] = .stringConvertible(cid)
+        return clientLogger
+    }
+    public func forInteraction(_ inter: Interaction) -> Logger
+    {
+        let requestId = inter.requestId
+        var interactionLogger = self
+        interactionLogger[metadataKey: "requestId"] = .string(requestId)
+        return interactionLogger
+    }
+}

Sources/allonet2/Logging/LoggingUtil.swift

@@ -0,0 +1,83 @@
+// i e: anything but Linux
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(visionOS)
+
+import Foundation
+import Logging
+import os.log
+
+public struct OSLogHandler: LogHandler
+{
+    public init(subsystem: String, category: String) {
+        self.log = OSLog(subsystem: subsystem, category: category)
+    }
+    
+    private let log: OSLog
+    
+    public var logLevel: Logging.Logger.Level = .info
+    public var metadataProvider: Logging.Logger.MetadataProvider?
+    public var metadata = Logging.Logger.Metadata()
+
+    public subscript(metadataKey metadataKey: String) -> Logging.Logger.Metadata.Value? {
+        get {
+            self.metadata[metadataKey]
+        }
+        set {
+            self.metadata[metadataKey] = newValue
+        }
+    }
+
+    public func log(
+        level: Logging.Logger.Level,
+        message: Logging.Logger.Message,
+        metadata explicitMetadata: Logging.Logger.Metadata?,
+        source: String,
+        file: String,
+        function: String,
+        line: UInt
+    ) {
+        let effectiveMetadata = Self.prepareMetadata(
+            base: self.metadata,
+            provider: self.metadataProvider,
+            explicit: explicitMetadata
+        )
+        let metas = effectiveMetadata.map {"\($0): \($1)"}.joined(separator: ", ")
+        let type = Self.levels[level]!
+        os_log("%{public}@", log: log, type: type, "\(message)\n# from \(file)#\(line) \(function) [\(metas)]")
+    }
+
+    internal static func prepareMetadata(
+        base: Logging.Logger.Metadata,
+        provider: Logging.Logger.MetadataProvider?,
+        explicit: Logging.Logger.Metadata?
+    ) -> Logging.Logger.Metadata {
+        var metadata = base
+
+        let provided = provider?.get() ?? [:]
+
+        guard !provided.isEmpty || !((explicit ?? [:]).isEmpty) else {
+            return metadata
+        }
+
+        if !provided.isEmpty {
+            metadata.merge(provided, uniquingKeysWith: { _, provided in provided })
+        }
+
+        if let explicit = explicit, !explicit.isEmpty {
+            metadata.merge(explicit, uniquingKeysWith: { _, explicit in explicit })
+        }
+
+        return metadata
+    }
+    
+    private static var levels: [Logging.Logger.Level: OSLogType] = [
+        .trace: .debug,
+        .debug: .debug,
+        .info: .info,
+        .notice: .info,
+        .warning: .info,
+        .error: .error,
+        .critical: .fault
+    ]
+}
+
+#endif

Sources/allonet2/Logging/OSLogging.swift

@@ -8,7 +8,6 @@
 import Foundation
 import simd
 import OpenCombineShim
-import Logging
 
 func with<T>(_ value: T, using closure: (inout T) -> Void) -> T {
     var copy = value
@@ -303,20 +302,3 @@ public func configurePrintBuffering()
     setvbuf(stdout, nil, _IOLBF, 0)   // line-buffered
     setvbuf(stderr, nil, _IONBF, 0)   // unbuffered
 }
-
-extension Logger
-{
-    public func forClient(_ cid: ClientId) -> Logger
-    {
-        var clientLogger = self
-        clientLogger[metadataKey: "clientId"] = .stringConvertible(cid)
-        return clientLogger
-    }
-    public func forInteraction(_ inter: Interaction) -> Logger
-    {
-        let requestId = inter.requestId
-        var interactionLogger = self
-        interactionLogger[metadataKey: "requestId"] = .string(requestId)
-        return interactionLogger
-    }
-}