astzweig/swift-log-oslog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt internal API to Swift API Design Guidelines

Browse Source
This commit is contained in:
T. R. Bernstein
2026-03-02 16:46:05 +01:00
parent e957caf031
commit e3f2ba03ef
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Logging OSLog/Logging OSLog.swift
View File

@@ -78,7 +78,7 @@ public struct LoggingOSLog: LogHandler {
function: String, function: String,
line: UInt line: UInt
) { ) {
let metadataCSV = Self.joinMetadata(self.metadata, self.metadataProvider?.get(), metadata) let metadataCSV = Self.joinedMetadata(self.metadata, self.metadataProvider?.get(), metadata)
let messageParts = [message.description, metadataCSV] let messageParts = [message.description, metadataCSV]
let message = messageParts.compactMap { $0 }.joined(separator: " -> ") let message = messageParts.compactMap { $0 }.joined(separator: " -> ")
@@ -97,17 +97,17 @@ public struct LoggingOSLog: LogHandler {
} }
} }
private static func joinMetadata(_ metadataList: Logging.Logger.Metadata?...) -> String? { private static func joinedMetadata(_ metadataList: Logging.Logger.Metadata?...) -> String? {
var metadataAggregator: Logging.Logger.Metadata = [:] var metadataAggregator: Logging.Logger.Metadata = [:]
for metadata in metadataList { for metadata in metadataList {
guard let metadata = metadata else { continue } guard let metadata = metadata else { continue }
metadataAggregator.merge(metadata) { return $1 } metadataAggregator.merge(metadata) { return $1 }
} }
return Self.joinMetadata(metadataAggregator) return Self.joinedMetadata(metadataAggregator)
} }
private static func joinMetadata(_ metadata: Logging.Logger.Metadata, with separator: String = ", ") -> String? { private static func joinedMetadata(_ metadata: Logging.Logger.Metadata, with separator: String = ", ") -> String? {
guard !metadata.isEmpty else { return nil } guard !metadata.isEmpty else { return nil }
return metadata.map { "\($0) = \($1)" }.joined(separator: separator) return metadata.map { "\"\($0)\": \"\($1)\"" }.joined(separator: separator)
} }
} }