From 8f82d32665d6eaa878eeaac84e82412562928e71 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 29 Sep 2022 16:13:24 -0500 Subject: [PATCH] Change visibility of system error messages included in logs so that they are useful in production --- .../CloudKit/CloudKitArticlesZoneDelegate.swift | 10 +++++----- .../CloudKit/CloudKitSendStatusOperation.swift | 4 ++-- .../Account/Feedbin/FeedbinAccountDelegate.swift | 2 +- .../Account/Feedly/FeedlyAccountDelegate.swift | 6 +++--- ...dlyCreateFeedsForCollectionFoldersOperation.swift | 4 ++-- .../Operations/FeedlyDownloadArticlesOperation.swift | 6 +++--- .../Operations/FeedlyGetCollectionsOperation.swift | 2 +- .../Operations/FeedlyGetEntriesOperation.swift | 2 +- .../FeedlyGetStreamContentsOperation.swift | 2 +- .../FeedlyGetUpdatedArticleIdsOperation.swift | 2 +- .../FeedlyIngestStreamArticleIdsOperation.swift | 2 +- .../Feedly/Operations/FeedlyLogoutOperation.swift | 4 ++-- .../FeedlyMirrorCollectionsAsFoldersOperation.swift | 4 ++-- .../FeedlyOrganiseParsedItemsByFeedOperation.swift | 2 +- .../Operations/FeedlyRequestStreamsOperation.swift | 2 +- .../Feedly/Operations/FeedlySyncAllOperation.swift | 8 ++++---- .../FeedlySyncStreamContentsOperation.swift | 12 ++++++------ .../FeedlyUpdateAccountFeedsWithItemsOperation.swift | 2 +- .../Internals/NewsBlurAccountDelegate+Internal.swift | 6 +++--- .../Account/ReaderAPI/ReaderAPIAccountDelegate.swift | 6 +++--- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- 21 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift b/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift index 3fae6a5db..95f607f07 100644 --- a/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift @@ -99,7 +99,7 @@ private extension CloudKitArticlesZoneDelegate { account?.markAsUnread(updateableUnreadArticleIDs) { result in if case .failure(let databaseError) = result { errorOccurred = true - self.logger.error("Error occurred while storing unread statuses: \(databaseError.localizedDescription)") + self.logger.error("Error occurred while storing unread statuses: \(databaseError.localizedDescription, privacy: .public)") } group.leave() } @@ -108,7 +108,7 @@ private extension CloudKitArticlesZoneDelegate { account?.markAsRead(updateableReadArticleIDs) { result in if case .failure(let databaseError) = result { errorOccurred = true - self.logger.error("Error occurred while storing read statuses: \(databaseError.localizedDescription)") + self.logger.error("Error occurred while storing read statuses: \(databaseError.localizedDescription, privacy: .public)") } group.leave() } @@ -117,7 +117,7 @@ private extension CloudKitArticlesZoneDelegate { account?.markAsUnstarred(updateableUnstarredArticleIDs) { result in if case .failure(let databaseError) = result { errorOccurred = true - self.logger.error("Error occurred while storing unstarred statuses: \(databaseError.localizedDescription)") + self.logger.error("Error occurred while storing unstarred statuses: \(databaseError.localizedDescription, privacy: .public)") } group.leave() } @@ -126,7 +126,7 @@ private extension CloudKitArticlesZoneDelegate { account?.markAsStarred(updateableStarredArticleIDs) { result in if case .failure(let databaseError) = result { errorOccurred = true - self.logger.error("Error occurred while stroing starred records: \(databaseError.localizedDescription)") + self.logger.error("Error occurred while stroing starred records: \(databaseError.localizedDescription, privacy: .public)") } group.leave() } @@ -152,7 +152,7 @@ private extension CloudKitArticlesZoneDelegate { } case .failure(let databaseError): errorOccurred = true - self.logger.error("Error occurred while storing articles: \(databaseError.localizedDescription)") + self.logger.error("Error occurred while storing articles: \(databaseError.localizedDescription, privacy: .public)") group.leave() } } diff --git a/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift b/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift index def4329ce..e71867115 100644 --- a/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift +++ b/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift @@ -49,7 +49,7 @@ class CloudKitSendStatusOperation: MainThreadOperation, Logging { self.refreshProgress?.addToNumberOfTasksAndRemaining(ticks) self.selectForProcessing() case .failure(let databaseError): - self.logger.error("Send status count pending error: \(databaseError.localizedDescription)") + self.logger.error("Send status count pending error: \(databaseError.localizedDescription, privacy: .public)") self.operationDelegate?.cancelOperation(self) } } @@ -93,7 +93,7 @@ private extension CloudKitSendStatusOperation { } case .failure(let databaseError): - self.logger.error("Send status error: \(databaseError.localizedDescription)") + self.logger.error("Send status error: \(databaseError.localizedDescription, privacy: .public)") self.operationDelegate?.cancelOperation(self) } } diff --git a/Account/Sources/Account/Feedbin/FeedbinAccountDelegate.swift b/Account/Sources/Account/Feedbin/FeedbinAccountDelegate.swift index 43fea522f..334f02e4b 100644 --- a/Account/Sources/Account/Feedbin/FeedbinAccountDelegate.swift +++ b/Account/Sources/Account/Feedbin/FeedbinAccountDelegate.swift @@ -863,7 +863,7 @@ private extension FeedbinAccountDelegate { guard let taggings = taggings else { return } assert(Thread.isMainThread) - logger.debug("Syncing taggings with \(taggings.count) taggings.") + logger.debug("Syncing taggings with \(taggings.count, privacy: .public) taggings.") // Set up some structures to make syncing easier let folderDict = nameToFolderDictionary(with: account.folders) diff --git a/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift b/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift index d8e9a37de..ba4f133d3 100644 --- a/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift +++ b/Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift @@ -132,7 +132,7 @@ final class FeedlyAccountDelegate: AccountDelegate, Logging { self?.accountMetadata?.lastArticleFetchEndTime = Date() } - self?.logger.debug("Sync took \(-date.timeIntervalSinceNow) seconds.") + self?.logger.debug("Sync took \(-date.timeIntervalSinceNow, privacy: .public) seconds.") completion(result) } @@ -150,12 +150,12 @@ final class FeedlyAccountDelegate: AccountDelegate, Logging { case .success: completion?(.success(())) case .failure(let error): - self.logger.error("Failed to refresh article status for account \(String(describing: account.type)): \(error.localizedDescription, privacy: .public)") + self.logger.error("Failed to refresh article status for account \(String(describing: account.type), privacy: .public): \(error.localizedDescription, privacy: .public)") completion?(.failure(error)) } } case .failure(let error): - self.logger.error("Failed to send article status for account \(String(describing: account.type)): \(error.localizedDescription, privacy: .public)") + self.logger.error("Failed to send article status for account \(String(describing: account.type), privacy: .public): \(error.localizedDescription, privacy: .public)") completion?(.failure(error)) } } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift index 4637228e8..8f8f6186d 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyCreateFeedsForCollectionFoldersOperation.swift @@ -91,7 +91,7 @@ final class FeedlyCreateFeedsForCollectionFoldersOperation: FeedlyOperation, Log return (feed, folder) } - logger.debug("Processing \(feedsAndFolders.count) feeds.") + logger.debug("Processing \(feedsAndFolders.count, privacy: .public) feeds.") feedsAndFolders.forEach { (feed, folder) in if !folder.has(feed) { folder.addWebFeed(feed) @@ -104,7 +104,7 @@ final class FeedlyCreateFeedsForCollectionFoldersOperation: FeedlyOperation, Log account.removeFeeds(feedsWithoutCollections) if !feedsWithoutCollections.isEmpty { - logger.debug("Removed \(feedsWithoutCollections.count) feeds.") + logger.debug("Removed \(feedsWithoutCollections.count, privacy: .public) feeds.") } } } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift index 975d9c86e..06a28ccb2 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift @@ -35,7 +35,7 @@ class FeedlyDownloadArticlesOperation: FeedlyOperation, Logging { var articleIds = missingArticleEntryIdProvider.entryIds articleIds.formUnion(updatedArticleEntryIdProvider.entryIds) - self.logger.debug("Requesting \(articleIds.count) articles.") + self.logger.debug("Requesting \(articleIds.count, privacy: .public) articles.") let feedlyAPILimitBatchSize = 1000 for articleIds in Array(articleIds).chunked(into: feedlyAPILimitBatchSize) { @@ -65,7 +65,7 @@ class FeedlyDownloadArticlesOperation: FeedlyOperation, Logging { } override func didCancel() { - logger.debug("Cancelling \(String(describing: self)).") + logger.debug("Cancelling \(String(describing: self), privacy: .public).") operationQueue.cancelAllOperations() super.didCancel() } @@ -84,7 +84,7 @@ extension FeedlyDownloadArticlesOperation: FeedlyOperationDelegate { assert(Thread.isMainThread) // Having this log is useful for debugging missing required JSON keys in the response from Feedly, for example. - self.logger.debug("\(String(describing: operation)) failed with error: \(error.localizedDescription, privacy: .public)") + self.logger.debug("\(String(describing: operation), privacy: .public) failed with error: \(error.localizedDescription, privacy: .public)") cancel() } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift index 2e48da7a7..b7a761e9d 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetCollectionsOperation.swift @@ -30,7 +30,7 @@ final class FeedlyGetCollectionsOperation: FeedlyOperation, FeedlyCollectionProv service.getCollections { result in switch result { case .success(let collections): - self.logger.debug("Receving collections: \(collections.map({ $0.id }))") + self.logger.debug("Receving collections: \(collections.map({ $0.id }), privacy: .public)") self.collections = collections self.didFinish() diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift index e6ce474f3..f064488a4 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetEntriesOperation.swift @@ -40,7 +40,7 @@ final class FeedlyGetEntriesOperation: FeedlyOperation, FeedlyEntryProviding, Fe let entryIds = Set(entries.map { $0.id }) let parsedIds = Set(parsed.map { $0.uniqueID }) let difference = entryIds.subtracting(parsedIds) - self.logger.debug("\(String(describing: self)) dropping articles with ids: \(difference)).") + self.logger.debug("\(String(describing: self), privacy: .public) dropping articles with ids: \(difference)).") } storedParsedEntries = parsed diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift index 2add9d7e7..68889cb93 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetStreamContentsOperation.swift @@ -58,7 +58,7 @@ final class FeedlyGetStreamContentsOperation: FeedlyOperation, FeedlyEntryProvid let entryIds = Set(entries.map { $0.id }) let parsedIds = Set(parsed.map { $0.uniqueID }) let difference = entryIds.subtracting(parsedIds) - logger.debug("Dropping articles with ids: \(difference)") + logger.debug("Dropping articles with ids: \(difference, privacy: .public)") } storedParsedEntries = parsed diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift index bc6fa1a7f..dd7197714 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift @@ -64,7 +64,7 @@ class FeedlyGetUpdatedArticleIdsOperation: FeedlyOperation, FeedlyEntryIdentifie storedUpdatedArticleIds.formUnion(streamIds.ids) guard let continuation = streamIds.continuation else { - self.logger.debug("\(self.storedUpdatedArticleIds.count) articles updated since last successful sync start date.") + self.logger.debug("\(self.storedUpdatedArticleIds.count, privacy: .public) articles updated since last successful sync start date.") didFinish() return } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift index cad5c1653..19fa27c4e 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift @@ -56,7 +56,7 @@ class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation, Logging { } guard let continuation = streamIds.continuation else { - self.logger.debug("Reached end of stream: \(self.resource.id).") + self.logger.debug("Reached end of stream: \(self.resource.id, privacy: .public).") self.didFinish() return } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyLogoutOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyLogoutOperation.swift index c878db9d7..772b253f4 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyLogoutOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyLogoutOperation.swift @@ -24,7 +24,7 @@ final class FeedlyLogoutOperation: FeedlyOperation, Logging { } override func run() { - self.logger.debug("Requesting logout of \(String(describing: self.account.type)).") + self.logger.debug("Requesting logout of \(String(describing: self.account.type), privacy: .public).") service.logout(completion: didCompleteLogout(_:)) } @@ -32,7 +32,7 @@ final class FeedlyLogoutOperation: FeedlyOperation, Logging { assert(Thread.isMainThread) switch result { case .success: - self.logger.debug("Logged out of \(String(describing: self.account.type)).") + self.logger.debug("Logged out of \(String(describing: self.account.type), privacy: .public).") do { try account.removeCredentials(type: .oauthAccessToken) try account.removeCredentials(type: .oauthRefreshToken) diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift index 7baab0236..fa154ff56 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyMirrorCollectionsAsFoldersOperation.swift @@ -44,7 +44,7 @@ final class FeedlyMirrorCollectionsAsFoldersOperation: FeedlyOperation, FeedlyFe return (collection.feeds, folder) } - self.logger.debug("Ensured \(self.feedsAndFolders.count) folders for \(collections.count) collections.") + self.logger.debug("Ensured \(self.feedsAndFolders.count, privacy: .public) folders for \(collections.count, privacy: .public) collections.") // Remove folders without a corresponding collection let collectionFolders = Set(feedsAndFolders.map { $0.1 }) @@ -55,7 +55,7 @@ final class FeedlyMirrorCollectionsAsFoldersOperation: FeedlyOperation, FeedlyFe account.removeFolder(unmatched) } - self.logger.debug("Removed \(foldersWithoutCollections.count) folders: \(foldersWithoutCollections.map({ $0.externalID ?? $0.nameForDisplay }))") + self.logger.debug("Removed \(foldersWithoutCollections.count, privacy: .public) folders: \(foldersWithoutCollections.map({ $0.externalID ?? $0.nameForDisplay }), privacy: .public)") } } } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyOrganiseParsedItemsByFeedOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyOrganiseParsedItemsByFeedOperation.swift index 68637b82e..7923416d7 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyOrganiseParsedItemsByFeedOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyOrganiseParsedItemsByFeedOperation.swift @@ -58,7 +58,7 @@ final class FeedlyOrganiseParsedItemsByFeedOperation: FeedlyOperation, FeedlyPar dict[key] = value } - self.logger.debug("Grouped \(items.count) items by \(dict.count) feeds for \(self.parsedItemProvider.parsedItemProviderName).") + self.logger.debug("Grouped \(items.count, privacy: .public) items by \(dict.count, privacy: .public) feeds for \(self.parsedItemProvider.parsedItemProviderName, privacy: .public).") itemsKeyedByFeedId = dict } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyRequestStreamsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyRequestStreamsOperation.swift index 790f43fe7..ae4eda8d2 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyRequestStreamsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyRequestStreamsOperation.swift @@ -52,6 +52,6 @@ final class FeedlyRequestStreamsOperation: FeedlyOperation, Logging { queueDelegate?.feedlyRequestStreamsOperation(self, enqueue: operation) } - self.logger.debug("Requested \(self.collectionsProvider.collections.count) collections streams.") + self.logger.debug("Requested \(self.collectionsProvider.collections.count, privacy: .public) collections streams.") } } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlySyncAllOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlySyncAllOperation.swift index 8481e9b21..79b8efaed 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlySyncAllOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlySyncAllOperation.swift @@ -127,12 +127,12 @@ final class FeedlySyncAllOperation: FeedlyOperation, Logging { } override func run() { - logger.debug("Starting sync \(self.syncUUID.uuidString).") + logger.debug("Starting sync \(self.syncUUID.uuidString, privacy: .public).") operationQueue.resume() } override func didCancel() { - logger.debug("Cancelling sync \(self.syncUUID.uuidString).") + logger.debug("Cancelling sync \(self.syncUUID.uuidString, privacy: .public).") self.operationQueue.cancelAllOperations() syncCompletionHandler = nil super.didCancel() @@ -143,7 +143,7 @@ extension FeedlySyncAllOperation: FeedlyCheckpointOperationDelegate { func feedlyCheckpointOperationDidReachCheckpoint(_ operation: FeedlyCheckpointOperation) { assert(Thread.isMainThread) - logger.debug("Sync completed: \(self.syncUUID.uuidString).") + logger.debug("Sync completed: \(self.syncUUID.uuidString, privacy: .public).") syncCompletionHandler?(.success(())) syncCompletionHandler = nil @@ -158,7 +158,7 @@ extension FeedlySyncAllOperation: FeedlyOperationDelegate { assert(Thread.isMainThread) // Having this log is useful for debugging missing required JSON keys in the response from Feedly, for example. - logger.debug("\(String(describing: operation)) failed with error: \(error.localizedDescription, privacy: .public).") + logger.debug("\(String(describing: operation), privacy: .public) failed with error: \(error.localizedDescription, privacy: .public).") syncCompletionHandler?(.failure(error)) syncCompletionHandler = nil diff --git a/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift index 6a9bbaf5e..1aff8a125 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlySyncStreamContentsOperation.swift @@ -48,13 +48,13 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD } override func didCancel() { - self.logger.debug("Cancelling sync stream contents for \(self.resource.id).") + self.logger.debug("Cancelling sync stream contents for \(self.resource.id, privacy: .public).") operationQueue.cancelAllOperations() super.didCancel() } func enqueueOperations(for continuation: String?) { - self.logger.debug("Requesting page for \(self.resource.id).") + self.logger.debug("Requesting page for \(self.resource.id, privacy: .public).") let operations = pageOperations(for: continuation) operationQueue.addOperations(operations) } @@ -87,14 +87,14 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD func feedlyGetStreamContentsOperation(_ operation: FeedlyGetStreamContentsOperation, didGetContentsOf stream: FeedlyStream) { guard !isCanceled else { - self.logger.debug("Cancelled requesting page for \(self.resource.id).") + self.logger.debug("Cancelled requesting page for \(self.resource.id, privacy: .public).") return } - self.logger.debug("Ingesting \(stream.items.count) from \(stream.id).") + self.logger.debug("Ingesting \(stream.items.count, privacy: .public) from \(stream.id, privacy: .public).") guard isPagingEnabled, let continuation = stream.continuation else { - self.logger.debug("Reached end of stream for \(stream.id).") + self.logger.debug("Reached end of stream for \(stream.id, privacy: .public).") return } @@ -102,7 +102,7 @@ final class FeedlySyncStreamContentsOperation: FeedlyOperation, FeedlyOperationD } func feedlyCheckpointOperationDidReachCheckpoint(_ operation: FeedlyCheckpointOperation) { - self.logger.debug("Completed ingesting items from \(self.resource.id).") + self.logger.debug("Completed ingesting items from \(self.resource.id, privacy: .public).") didFinish() } diff --git a/Account/Sources/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift b/Account/Sources/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift index 4218f15e5..d3e64dc9d 100644 --- a/Account/Sources/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift +++ b/Account/Sources/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift @@ -30,7 +30,7 @@ final class FeedlyUpdateAccountFeedsWithItemsOperation: FeedlyOperation, Logging return } - self.logger.debug("Updated \(webFeedIDsAndItems.count) feeds for \(self.organisedItemsProvider.parsedItemsByFeedProviderName).") + self.logger.debug("Updated \(webFeedIDsAndItems.count, privacy: .public) feeds for \(self.organisedItemsProvider.parsedItemsByFeedProviderName, privacy: .public).") self.didFinish() } } diff --git a/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift b/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift index 1463cc546..e21a8dd72 100644 --- a/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift +++ b/Account/Sources/Account/NewsBlur/Internals/NewsBlurAccountDelegate+Internal.swift @@ -39,7 +39,7 @@ extension NewsBlurAccountDelegate { guard let folders = folders else { return } assert(Thread.isMainThread) - logger.debug("Syncing folders with \(folders.count) folders.") + logger.debug("Syncing folders with \(folders.count, privacy: .public) folders.") let folderNames = folders.map { $0.name } @@ -77,7 +77,7 @@ extension NewsBlurAccountDelegate { guard let feeds = feeds else { return } assert(Thread.isMainThread) - logger.debug("Syncing feeds with \(feeds.count) feeds.") + logger.debug("Syncing feeds with \(feeds.count, privacy: .public) feeds.") let newsBlurFeedIds = feeds.map { String($0.feedID) } @@ -128,7 +128,7 @@ extension NewsBlurAccountDelegate { guard let folders = folders else { return } assert(Thread.isMainThread) - logger.debug("Syncing folders with \(folders.count) folders.") + logger.debug("Syncing folders with \(folders.count, privacy: .public) folders.") // Set up some structures to make syncing easier let relationships = folders.map({ $0.asRelationships }).flatMap { $0 } diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift index 469a04532..ae2c4ae49 100644 --- a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift +++ b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift @@ -709,7 +709,7 @@ private extension ReaderAPIAccountDelegate { guard !folderTags.isEmpty else { return } - logger.debug("Syncing folders with \(folderTags.count) tags.") + logger.debug("Syncing folders with \(folderTags.count, privacy: .public) tags.") let readerFolderExternalIDs = folderTags.compactMap { $0.tagID } @@ -749,7 +749,7 @@ private extension ReaderAPIAccountDelegate { guard let subscriptions = subscriptions else { return } assert(Thread.isMainThread) - logger.debug("Syncing feeds with \(subscriptions.count) subscriptions") + logger.debug("Syncing feeds with \(subscriptions.count, privacy: .public) subscriptions") let subFeedIds = subscriptions.map { $0.feedID } @@ -791,7 +791,7 @@ private extension ReaderAPIAccountDelegate { func syncFeedFolderRelationship(_ account: Account, _ subscriptions: [ReaderAPISubscription]?) { guard let subscriptions = subscriptions else { return } assert(Thread.isMainThread) - logger.debug("Syncing taggins with \(subscriptions.count) subscriptions.") + logger.debug("Syncing taggins with \(subscriptions.count, privacy: .public) subscriptions.") // Set up some structures to make syncing easier let folderDict = externalIDToFolderDictionary(with: account.folders) diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8225e2a95..484a5cd1b 100644 --- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/Ranchero-Software/RSCore.git", "state": { "branch": null, - "revision": "3af73640bcf7bcfd1a462986d5a1c69b37822155", - "version": "1.0.13" + "revision": "4425a29db97b97c44e9ebee16e6090b116b10055", + "version": "1.0.14" } }, {