From 822879c18e03062f89e01cb783b6667ec3e709b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kiel=20Gillard=20=F0=9F=A4=AA?= Date: Wed, 30 Sep 2020 10:11:16 +1000 Subject: [PATCH] Make some of the identifiers public to assist in debugging issues adding feeds #2443 --- .../Operations/FeedlyGetCollectionsOperation.swift | 2 +- .../FeedlySyncStreamContentsOperation.swift | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Frameworks/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift index 297bd3cd7..8477bb910 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift @@ -32,7 +32,7 @@ final class FeedlyGetCollectionsOperation: FeedlyOperation, FeedlyCollectionProv service.getCollections { result in switch result { case .success(let collections): - os_log(.debug, log: self.log, "Received collections: %@.", collections.map { $0.id }) + os_log(.debug, log: self.log, "Received collections: %{public}@", collections.map { $0.id }) self.collections = collections self.didFinish() diff --git a/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift index 47625992d..ef1770967 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift @@ -51,13 +51,13 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD } override func didCancel() { - os_log(.debug, log: log, "Canceling sync stream contents") + os_log(.debug, log: log, "Canceling sync stream contents for %{public}@", resource.id) operationQueue.cancelAllOperations() super.didCancel() } func enqueueOperations(for continuation: String?) { - os_log(.debug, log: log, "Requesting page for %@", resource.id) + os_log(.debug, log: log, "Requesting page for %{public}@", resource.id) let operations = pageOperations(for: continuation) operationQueue.addOperations(operations) } @@ -91,14 +91,14 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD func feedlyGetStreamContentsOperation(_ operation: FeedlyGetStreamContentsOperation, didGetContentsOf stream: FeedlyStream) { guard !isCanceled else { - os_log(.debug, log: log, "Cancelled requesting page for %@", resource.id) + os_log(.debug, log: log, "Cancelled requesting page for %{public}@", resource.id) return } - os_log(.debug, log: log, "Ingesting %i items from %@", stream.items.count, stream.id) + os_log(.debug, log: log, "Ingesting %i items from %{public}@", stream.items.count, stream.id) guard isPagingEnabled, let continuation = stream.continuation else { - os_log(.debug, log: log, "Reached end of stream for %@", stream.id) + os_log(.debug, log: log, "Reached end of stream for %{public}@", stream.id) return } @@ -106,7 +106,7 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD } func feedlyCheckpointOperationDidReachCheckpoint(_ operation: FeedlyCheckpointOperation) { - os_log(.debug, log: log, "Completed ingesting items from %@", resource.id) + os_log(.debug, log: log, "Completed ingesting items from %{public}@", resource.id) didFinish() }