Skip to content

Commit b357c36

Browse files
marekpridalmarekpridal
committed
Migrate to Logger
1 parent 833c177 commit b357c36

2 files changed

Lines changed: 31 additions & 69 deletions

File tree

‎Package.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import PackageDescription
66
//swiftlint:disable all
77
let package = Package(
88
name: "LogKit",
9+
platforms: [.macOS(.v11), .iOS(.v14), .macCatalyst(.v14), .tvOS(.v14), .watchOS(.v7), .visionOS(.v1)],
910
products: [
1011
// Products define the executables and libraries produced by a package, and make them visible to other packages.
1112
.library(

‎Sources/LogKit/LogKit.swift‎

Lines changed: 30 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -43,44 +43,31 @@ public enum Log {
4343
#endif
4444
public static func function(_ function: String, in file: String) {
4545
guard enabledLogging.contains(.function) else { return }
46-
#if canImport(Darwin)
4746
let logger = Logger(subsystem: subsystem, category: Category.function.rawValue)
4847
logger.debug("\(function) \(file)")
49-
#elseif os(Android)
50-
#endif
5148
}
5249

5350
public static func `default`(_ string: String) {
5451
guard enabledLogging.contains(.default) else { return }
55-
#if canImport(Darwin)
56-
let logObject = OSLog(subsystem: subsystem, category: Category.default.rawValue)
57-
os_log("%{PRIVATE}@", log: logObject, type: .debug, string)
58-
#elseif os(Android)
59-
#endif
52+
let logger = Logger(subsystem: subsystem, category: Category.default.rawValue)
53+
logger.debug("\(string)")
6054
}
6155

6256
public static func requestCalled(function: String) {
6357
guard enabledLogging.contains(.networking) else { return }
64-
#if canImport(Darwin)
65-
let logObject = OSLog(subsystem: subsystem, category: Category.networking.rawValue)
66-
os_log("%{PRIVATE}@ already called", log: logObject, type: .debug, function)
67-
#elseif os(Android)
68-
#endif
58+
let logger = Logger(subsystem: subsystem, category: Category.networking.rawValue)
59+
logger.debug("\(function) already called")
6960
}
7061

7162
public static func expiration(date: Date) {
7263
guard enabledLogging.contains(.expiration) else { return }
73-
#if canImport(Darwin)
74-
let logObject = OSLog(subsystem: subsystem, category: Category.expiration.rawValue)
75-
os_log("[GMT] Valid until %{PRIVATE}@", log: logObject, type: .debug, date.debugDescription)
76-
#elseif os(Android)
77-
#endif
64+
let logger = Logger(subsystem: subsystem, category: Category.expiration.rawValue)
65+
logger.debug("[GMT] Valid until \(date.debugDescription)")
7866
}
7967

8068
public static func request(_ request: URLRequest) {
8169
guard enabledLogging.contains(.networking) else { return }
82-
#if canImport(Darwin)
83-
let logObject = OSLog(subsystem: subsystem, category: Category.networking.rawValue)
70+
let logger = Logger(subsystem: subsystem, category: Category.networking.rawValue)
8471
var message = "\n---REQUEST------------------\n"
8572
message.append("URL -> \((request.url?.absoluteString ?? ""))\n")
8673
message.append("METHOD -> \(request.httpMethod ?? "")\n")
@@ -93,15 +80,12 @@ public enum Log {
9380
message.append("BODY -> \(String(data: body, encoding: .utf8) ?? "")\n")
9481
}
9582
message.append("----------------------------\n")
96-
os_log("%{PRIVATE}@", log: logObject, type: .debug, message)
97-
#elseif os(Android)
98-
#endif
83+
logger.debug("\(message)")
9984
}
10085

10186
public static func response(_ response: URLResponse?, data: Data?) {
10287
guard enabledLogging.contains(.networking) else { return }
103-
#if canImport(Darwin)
104-
let logObject = OSLog(subsystem: subsystem, category: Category.networking.rawValue)
88+
let logger = Logger(subsystem: subsystem, category: Category.networking.rawValue)
10589
guard let response = response, let data = data else { return }
10690
var message = "\n---RESPONSE------------------\n"
10791
message.append("URL -> \(response.url?.absoluteString ?? "")\n")
@@ -114,107 +98,84 @@ public enum Log {
11498
message.append("}\n")
11599
message.append("Response data -> \(String(data: data, encoding: .utf8) ?? "")\n")
116100
message.append("----------------------------\n")
117-
os_log("%{PRIVATE}@", log: logObject, type: .debug, message)
118-
#elseif os(Android)
119-
#endif
101+
logger.debug("\(message)")
120102
}
121103

122104
public static func function(_ function: String, text: String) {
123105
guard enabledLogging.contains(.function) else { return }
124-
#if canImport(Darwin)
125-
let logObject = OSLog(subsystem: subsystem, category: Category.function.rawValue)
126-
os_log("%{PRIVATE}@ %{PRIVATE}@", log: logObject, type: .debug, function, text)
127-
#elseif os(Android)
128-
#endif
106+
let logger = Logger(subsystem: subsystem, category: Category.function.rawValue)
107+
logger.debug("\(function) \(text)")
129108
}
130109

131110
public static func inAppPurchase(_ string: String) {
132111
guard enabledLogging.contains(.inAppPurchase) else { return }
133-
#if canImport(Darwin)
134-
let logObject = OSLog(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
135-
os_log("%{PRIVATE}@", log: logObject, type: .debug, string)
136-
#elseif os(Android)
137-
#endif
112+
let logger = Logger(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
113+
logger.debug("\(string)")
138114
}
139115

140116
public static func error(_ error: Error) {
141117
guard enabledLogging.contains(.error) else { return }
142-
#if canImport(Darwin)
143-
let logObject = OSLog(subsystem: subsystem, category: Category.error.rawValue)
144-
os_log("%{PRIVATE}@", log: logObject, type: .error, error.localizedDescription)
145-
#elseif os(Android)
146-
#endif
118+
let logger = Logger(subsystem: subsystem, category: Category.error.rawValue)
119+
logger.debug("\(error.localizedDescription)")
147120
}
148121

149122
public static func database(_ string: String) {
150123
guard enabledLogging.contains(.database) else { return }
151-
#if canImport(Darwin)
152-
let log = OSLog(subsystem: subsystem, category: LogKit.Log.Category.database.rawValue)
153-
os_log("%{PRIVATE}@", log: log, type: .debug, string)
154-
#elseif os(Android)
155-
#endif
124+
let logger = Logger(subsystem: subsystem, category: Category.database.rawValue)
125+
logger.debug("\(string)")
156126
}
157127

158128
public static func dependencyInjection(_ string: String) {
159129
guard enabledLogging.contains(.dependencyInjection) else { return }
160-
#if canImport(Darwin)
161-
let log = OSLog(subsystem: subsystem, category: LogKit.Log.Category.dependencyInjection.rawValue)
162-
os_log("%{PRIVATE}@", log: log, type: .debug, string)
163-
#elseif os(Android)
164-
#endif
130+
let logger = Logger(subsystem: subsystem, category: Category.dependencyInjection.rawValue)
131+
logger.debug("\(string)")
165132
}
166133
#if canImport(Darwin)
167-
@available(watchOS 6.2, *)
168134
public static func products(request: SKProductsRequest) {
169135
guard enabledLogging.contains(.inAppPurchase) else { return }
170-
let logObject = OSLog(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
136+
let logger = Logger(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
171137
var requestMessage = "\n---REQUEST------------------\n"
172138
requestMessage.append("\(request)")
173139
requestMessage.append("\n----------------------------\n")
174-
os_log("%{PRIVATE}@", log: logObject, type: .debug, requestMessage)
140+
logger.debug("\(requestMessage)")
175141
}
176142

177-
@available(watchOS 6.2, *)
178143
public static func products(response: SKProductsResponse) {
179144
guard enabledLogging.contains(.inAppPurchase) else { return }
180-
let logObject = OSLog(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
145+
let logger = Logger(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
181146
var responseMessage = "\n---RESPONSE------------------\n"
182147
responseMessage.append("Invalid product identifiers \(response.invalidProductIdentifiers)")
183148
responseMessage.append("\n----------------------------\n")
184149
responseMessage.append("Products \(response.products)")
185150
responseMessage.append("\n----------------------------\n")
186-
os_log("%{PRIVATE}@", log: logObject, type: .debug, responseMessage)
151+
logger.debug("\(responseMessage)")
187152
}
188153

189-
@available(watchOS 6.2, *)
190154
public static func products(request: SKRequest) {
191155
guard enabledLogging.contains(.inAppPurchase) else { return }
192-
let logObject = OSLog(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
156+
let logger = Logger(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
193157
var requestMessage = "\n---REQUEST------------------\n"
194158
requestMessage.append("\(request)")
195159
requestMessage.append("\n----------------------------\n")
196-
Log.default(requestMessage)
197-
os_log("%{PRIVATE}@", log: logObject, type: .debug, requestMessage)
160+
logger.debug("\(requestMessage)")
198161
}
199162

200-
@available(watchOS 6.2, *)
201163
public static func paymentQueue(_ queue: SKPaymentQueue) {
202164
guard enabledLogging.contains(.inAppPurchase) else { return }
203-
let logObject = OSLog(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
165+
let logger = Logger(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
204166
var requestMessage = "\n---QUEUE------------------\n"
205167
requestMessage.append("\(queue)")
206168
requestMessage.append("\n----------------------------\n")
207-
os_log("%{PRIVATE}@", log: logObject, type: .debug, requestMessage)
169+
logger.debug("\(requestMessage)")
208170
}
209171

210-
@available(watchOS 6.2, *)
211172
public static func payment(transactions: [SKPaymentTransaction]) {
212173
guard enabledLogging.contains(.inAppPurchase) else { return }
213-
let logObject = OSLog(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
174+
let logger = Logger(subsystem: subsystem, category: Category.inAppPurchase.rawValue)
214175
var responseMessage = "\n---UPDATED TRANSACTIONS------------------\n"
215176
responseMessage.append("\(transactions)")
216177
responseMessage.append("\n----------------------------\n")
217-
os_log("%{PRIVATE}@", log: logObject, type: .debug, responseMessage)
178+
logger.debug("\(responseMessage)")
218179
}
219180
#endif
220181
}

0 commit comments

Comments
 (0)