Skip to content

Commit 7ea44e8

Browse files
allenhumphreysallenhumphreys
committed
Use modern unified logging API
1 parent 78b29db commit 7ea44e8

36 files changed

+267
-386
lines changed

‎Packages/ConfCore/ConfCore/Bookmark+ConflictResolution.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010
import CloudKit
11-
import os.log
11+
import OSLog
1212

1313
extension Bookmark {
1414

‎Packages/ConfCore/ConfCore/BookmarkSyncObject.swift‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import CloudKitCodable
10-
import os.log
10+
import OSLog
1111

1212
public struct BookmarkSyncObject: CustomCloudKitCodable, BelongsToSession {
1313
public var cloudKitSystemFields: Data?
@@ -50,10 +50,7 @@ extension Bookmark: SyncObjectConvertible, BelongsToSession {
5050
do {
5151
bookmark.snapshot = try Data(contentsOf: snapshotURL)
5252
} catch {
53-
os_log("Failed to load bookmark snapshot from CloudKit: %{public}@",
54-
log: .default,
55-
type: .fault,
56-
String(describing: error))
53+
Logger.default.fault("Failed to load bookmark snapshot from CloudKit: \(String(describing: error), privacy: .public)")
5754
bookmark.snapshot = Data()
5855
}
5956
} else {
@@ -65,10 +62,7 @@ extension Bookmark: SyncObjectConvertible, BelongsToSession {
6562

6663
public var syncObject: BookmarkSyncObject? {
6764
guard let sessionId = session.first?.identifier else {
68-
os_log("Bookmark %@ is not associated to a session. That's illegal!",
69-
log: .default,
70-
type: .fault,
71-
identifier)
65+
Logger.default.fault("Bookmark \(self.identifier) is not associated to a session. That's illegal!")
7266

7367
return nil
7468
}

‎Packages/ConfCore/ConfCore/ContributorsFetcher.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
//
88

99
import Cocoa
10-
import os.log
10+
import OSLog
1111

1212
public final class ContributorsFetcher {
1313

1414
public static let shared: ContributorsFetcher = ContributorsFetcher()
1515

16-
private let log = OSLog(subsystem: "WWDC", category: "ContributorsFetcher")
16+
private let log = Logger(subsystem: "WWDC", category: "ContributorsFetcher")
1717

1818
fileprivate struct Constants {
1919
static let contributorsURL = "https://api.github.com/repos/insidegui/WWDC/contributors"
@@ -45,9 +45,9 @@ public final class ContributorsFetcher {
4545
let task = URLSession.shared.dataTask(with: url) { [unowned self] data, response, error in
4646
guard let data = data, error == nil else {
4747
if let error = error {
48-
os_log("Error fetching contributors: %{public}@", log: self.log, type: .error, String(describing: error))
48+
log.error("Error fetching contributors: \(String(describing: error), privacy: .public)")
4949
} else {
50-
os_log("Error fetching contributors: network call returned no data", log: self.log, type: .error)
50+
log.error("Error fetching contributors: network call returned no data")
5151
}
5252

5353
self.buildInfoText(self.names)
@@ -59,7 +59,7 @@ public final class ContributorsFetcher {
5959
do {
6060
self.names += try self.parseResponse(data)
6161
} catch {
62-
os_log("Failed to decode contributors names", log: self.log, type: .error)
62+
log.error("Failed to decode contributors names")
6363
}
6464

6565
if let linkHeader = (response as? HTTPURLResponse)?.allHeaderFields["Link"] as? String,

‎Packages/ConfCore/ConfCore/Environment.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Foundation
10-
import os.log
10+
import OSLog
1111

1212
public extension Notification.Name {
1313
static let WWDCEnvironmentDidChange = Notification.Name("WWDCEnvironmentDidChange")
@@ -48,7 +48,7 @@ public struct Environment: Equatable {
4848

4949
if shouldNotify {
5050
DispatchQueue.main.async {
51-
os_log("Environment base URL: %@", log: .default, type: .info, environment.baseURL)
51+
Logger.default.info("Environment base URL: \(environment.baseURL)")
5252

5353
NotificationCenter.default.post(name: .WWDCEnvironmentDidChange, object: environment)
5454
}

‎Packages/ConfCore/ConfCore/Error+CloudKit.swift‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010
import CloudKit
11-
import os.log
11+
import OSLog
1212

1313
extension Error {
1414

@@ -20,51 +20,39 @@ extension Error {
2020

2121
func resolveConflict(with resolver: (CKRecord, CKRecord) -> CKRecord?) -> CKRecord? {
2222
guard let effectiveError = self as? CKError else {
23-
os_log("resolveConflict called on an error that was not a CKError. The error was %{public}@",
24-
log: .default,
25-
type: .fault,
26-
String(describing: self))
23+
Logger.default.fault("resolveConflict called on an error that was not a CKError. The error was \(String(describing: self), privacy: .public)")
2724
return nil
2825
}
2926

3027
guard effectiveError.code == .serverRecordChanged else {
31-
os_log("resolveConflict called on a CKError that was not a serverRecordChanged error. The error was %{public}@",
32-
log: .default,
33-
type: .fault,
34-
String(describing: effectiveError))
28+
Logger.default.fault("resolveConflict called on a CKError that was not a serverRecordChanged error. The error was \(String(describing: effectiveError), privacy: .public)")
3529
return nil
3630
}
3731

3832
guard let clientRecord = effectiveError.userInfo[CKRecordChangedErrorClientRecordKey] as? CKRecord else {
39-
os_log("Failed to obtain client record from serverRecordChanged error. The error was %{public}@",
40-
log: .default,
41-
type: .fault,
42-
String(describing: effectiveError))
33+
Logger.default.fault("Failed to obtain client record from serverRecordChanged error. The error was \(String(describing: effectiveError), privacy: .public)")
4334
return nil
4435
}
4536

4637
guard let serverRecord = effectiveError.userInfo[CKRecordChangedErrorServerRecordKey] as? CKRecord else {
47-
os_log("Failed to obtain server record from serverRecordChanged error. The error was %{public}@",
48-
log: .default,
49-
type: .fault,
50-
String(describing: effectiveError))
38+
Logger.default.fault("Failed to obtain server record from serverRecordChanged error. The error was \(String(describing: effectiveError), privacy: .public)")
5139
return nil
5240
}
5341

5442
return resolver(clientRecord, serverRecord)
5543
}
5644

57-
@discardableResult func retryCloudKitOperationIfPossible(_ log: OSLog? = nil, in queue: DispatchQueue = .main, with block: @escaping () -> Void) -> Bool {
45+
@discardableResult func retryCloudKitOperationIfPossible(_ log: Logger? = nil, in queue: DispatchQueue = .main, with block: @escaping () -> Void) -> Bool {
5846
let effectiveLog = log ?? .default
5947

6048
guard let effectiveError = self as? CKError else { return false }
6149

6250
guard let retryDelay = effectiveError.retryAfterSeconds else {
63-
os_log("Error is not recoverable", log: effectiveLog, type: .error)
51+
effectiveLog.error("Error is not recoverable")
6452
return false
6553
}
6654

67-
os_log("Error is recoverable. Will retry after %{public}f seconds", log: effectiveLog, type: .error, retryDelay)
55+
effectiveLog.error("Error is recoverable. Will retry after \(retryDelay) seconds")
6856

6957
queue.asyncAfter(deadline: .now() + retryDelay) {
7058
block()

‎Packages/ConfCore/ConfCore/Favorite+ConflictResolution.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010
import CloudKit
11-
import os.log
11+
import OSLog
1212

1313
extension Favorite {
1414

‎Packages/ConfCore/ConfCore/FavoriteSyncObject.swift‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010
import CloudKitCodable
11-
import os.log
11+
import OSLog
1212

1313
public struct FavoriteSyncObject: CustomCloudKitCodable, BelongsToSession {
1414
public var cloudKitSystemFields: Data?
@@ -43,10 +43,7 @@ extension Favorite: SyncObjectConvertible, BelongsToSession {
4343

4444
public var syncObject: FavoriteSyncObject? {
4545
guard let sessionId = session.first?.identifier else {
46-
os_log("Favorite %@ is not associated to a session. That's illegal!",
47-
log: .default,
48-
type: .fault,
49-
identifier)
46+
Logger.default.fault("Favorite \(self.identifier) is not associated to a session. That's illegal!")
5047

5148
return nil
5249
}

‎Packages/ConfCore/ConfCore/Logger+Static.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//
2+
// File.swift
3+
//
4+
//
5+
// Created by Allen Humphreys on 5/30/23.
6+
//
7+
8+
import OSLog
9+
10+
extension Logger {
11+
public static let `default` = Logger()
12+
}

‎Packages/ConfCore/ConfCore/NSCodingExtensions.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import Foundation
1010
import QuartzCore
11-
import os.log
11+
import OSLog
1212

13-
private let _log = OSLog(subsystem: "ConfCore", category: "NSCodingExtensions")
13+
private let _log = Logger(subsystem: "ConfCore", category: "NSCodingExtensions")
1414

1515
public extension NSKeyedArchiver {
1616

‎Packages/ConfCore/ConfCore/SessionProgress+ConflictResolution.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010
import CloudKit
11-
import os.log
11+
import OSLog
1212

1313
extension SessionProgress {
1414

0 commit comments

Comments
 (0)