Skip to content

Commit 468338c

Browse files
authored
Optimize Logging implementation (#597)
1 parent 0dcf6c2 commit 468338c

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Sources/OpenSwiftUICore/Log/Logging.swift

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ package enum Log {
7878
@inline(__always)
7979
package static func log(_ message: @autoclosure () -> String, unless condition: @autoclosure () -> Bool, file: StaticString, line: UInt) {
8080
guard !condition() else { return }
81+
#if DEBUG
8182
#if OPENSWIFTUI_SWIFT_LOG
8283
internalErrorsLog.debug("\(message()) \(file) \(line)")
8384
#else
84-
#if DEBUG && OPENSWIFTUI_SUPPORT_2022_API
8585
os_log(.default, log: internalErrorsLog, "%s %s: %s", message(), file.description, line.description)
8686
#endif
8787
#endif
@@ -114,17 +114,24 @@ package enum Log {
114114
#if OPENSWIFTUI_SWIFT_LOG
115115
internalErrorsLog.log(level: .error, "\(message()) - \(file): - please file a bug report")
116116
#else
117-
#if OPENSWIFTUI_SUPPORT_2022_API
118117
os_log(.fault, log: internalErrorsLog, "%s %s: %s", message(), file.description, line.description)
119118
#endif
120119
print("\(message()) - \(file): - please file a bug report")
121-
#endif
122120
}
123121

124122
package static func internalError(_ message: @autoclosure () -> String) {
125123
internalError(message(), file: #fileID, line: #line)
126124
}
127-
125+
126+
@inline(__always)
127+
package static func internalError(_ message: StaticString, _ args: any CVarArg...) {
128+
#if OPENSWIFTUI_SWIFT_LOG
129+
internalErrorsLog.log(level: .error, "\(String(format: message.description, arguments: args))")
130+
#else
131+
os_log(.fault, log: internalErrorsLog, message, args)
132+
#endif
133+
}
134+
128135
package static func externalWarning(_ message: String) {
129136
#if OPENSWIFTUI_SWIFT_LOG
130137
unlocatedIssuesLog.log(level: .critical, "\(message)")
@@ -194,11 +201,9 @@ package enum Log {
194201
@usableFromInline
195202
package static var internalErrorsLog: Logger = Logger(subsystem: subsystem, category: "OpenSwiftUI")
196203
#else
197-
#if OPENSWIFTUI_SUPPORT_2022_API
198204
@usableFromInline
199205
package static var internalErrorsLog: OSLog = OSLog(subsystem: subsystem, category: "OpenSwiftUI")
200-
#endif
201-
206+
202207
@usableFromInline
203208
package static var eventDebuggingLog: OSLog = OSLog(subsystem: "com.apple.diagnostics.events", category: "OpenSwiftUI")
204209
#endif

0 commit comments

Comments
 (0)