From 52424047eb8ac6eacd3a31dc93b4509eea35ec7d Mon Sep 17 00:00:00 2001 From: Tony Li Date: Mon, 30 Sep 2024 12:45:05 +1300 Subject: [PATCH 1/2] Update DDLogXxx API to match CocoaLumberjack ones --- .../Utility/Logging/CocoaLumberjack.swift | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/WordPress/Classes/Utility/Logging/CocoaLumberjack.swift b/WordPress/Classes/Utility/Logging/CocoaLumberjack.swift index 142496772c91..38dbeecefab7 100644 --- a/WordPress/Classes/Utility/Logging/CocoaLumberjack.swift +++ b/WordPress/Classes/Utility/Logging/CocoaLumberjack.swift @@ -2,26 +2,26 @@ import Foundation import CocoaLumberjackSwift @inlinable -public func DDLogVerbose(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { - CocoaLumberjackSwift.DDLogVerbose("\(message())", file: file, function: function, line: line) +public func DDLogVerbose(_ message: @autoclosure () -> DDLogMessageFormat, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { + CocoaLumberjackSwift.DDLogVerbose(message(), file: file, function: function, line: line) } @inlinable -public func DDLogDebug(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { - CocoaLumberjackSwift.DDLogDebug("\(message())", file: file, function: function, line: line) +public func DDLogDebug(_ message: @autoclosure () -> DDLogMessageFormat, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { + CocoaLumberjackSwift.DDLogDebug(message(), file: file, function: function, line: line) } @inlinable -public func DDLogInfo(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { - CocoaLumberjackSwift.DDLogInfo("\(message())", file: file, function: function, line: line) +public func DDLogInfo(_ message: @autoclosure () -> DDLogMessageFormat, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { + CocoaLumberjackSwift.DDLogInfo(message(), file: file, function: function, line: line) } @inlinable -public func DDLogWarn(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { - CocoaLumberjackSwift.DDLogWarn("\(message())", file: file, function: function, line: line) +public func DDLogWarn(_ message: @autoclosure () -> DDLogMessageFormat, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { + CocoaLumberjackSwift.DDLogWarn(message(), file: file, function: function, line: line) } @inlinable -public func DDLogError(_ message: @autoclosure () -> Any, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { - CocoaLumberjackSwift.DDLogError("\(message())", file: file, function: function, line: line) +public func DDLogError(_ message: @autoclosure () -> DDLogMessageFormat, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) { + CocoaLumberjackSwift.DDLogError(message(), file: file, function: function, line: line) } From c0e1bd7f82d9822d6da34d439a002f680cd84cb8 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Mon, 30 Sep 2024 12:44:38 +1300 Subject: [PATCH 2/2] Update DDLogXxx functions --- .../Classes/Extensions/UIImageView+SiteIcon.swift | 6 +++--- WordPress/Classes/Services/CommentService+Likes.swift | 2 +- .../Classes/Services/Domains/DomainsService.swift | 2 +- WordPress/Classes/Services/GravatarService.swift | 2 +- WordPress/Classes/Services/PeopleService.swift | 6 +++--- WordPress/Classes/Services/PlanService.swift | 2 +- WordPress/Classes/Services/PostService+Likes.swift | 2 +- WordPress/Classes/Services/UsersService.swift | 2 +- WordPress/Classes/Stores/ActivityStore.swift | 2 +- WordPress/Classes/Stores/PluginStore.swift | 2 +- WordPress/Classes/Utility/AccountHelper.swift | 3 +-- .../BloggingRemindersScheduler.swift | 2 +- .../Utility/Logging/WordPressLibraryLogger.swift | 10 +++++----- WordPress/Classes/Utility/PingHubManager.swift | 2 +- .../Utility/Universal Links/Routes+Reader.swift | 2 +- .../Blog/SharingButtonsViewController.swift | 8 ++++---- .../Gutenberg/GutenbergViewController.swift | 10 +++++----- .../GutenbergWebNavigationViewController.swift | 2 +- .../Webview/JetpackConnectionWebViewController.swift | 2 +- .../ViewRelated/Me/Me Main/MeViewController.swift | 4 ++-- .../ViewRelated/Plans/PlanListViewController.swift | 2 +- .../ViewRelated/Reader/Filter/FilterProvider.swift | 2 +- .../ViewRelated/Reader/ReaderActionHelpers.swift | 2 +- .../Reader/ReaderPostCardCellViewModel.swift | 4 ++-- .../Classes/ViewRelated/Reader/ReaderTagCell.swift | 2 +- .../Reader/Tab Navigation/ReaderTabItemsStore.swift | 2 +- WordPress/Jetpack/Classes/Utility/DataMigrator.swift | 2 +- .../WordPressShareExtension/AppExtensionsService.swift | 4 ++-- .../ShareExtensionSessionManager.swift | 4 ++-- 29 files changed, 48 insertions(+), 49 deletions(-) diff --git a/WordPress/Classes/Extensions/UIImageView+SiteIcon.swift b/WordPress/Classes/Extensions/UIImageView+SiteIcon.swift index 458d26b20276..75db5271803b 100644 --- a/WordPress/Classes/Extensions/UIImageView+SiteIcon.swift +++ b/WordPress/Classes/Extensions/UIImageView+SiteIcon.swift @@ -90,7 +90,7 @@ extension UIImageView { if case .requestCancelled = error { // Do not log intentionally cancelled requests as errors. } else { - DDLogError(error.localizedDescription) + DDLogError("\(error.localizedDescription)") } } }) @@ -123,7 +123,7 @@ extension UIImageView { let host = MediaHost(with: blog) { error in // We'll log the error, so we know it's there, but we won't halt execution. - DDLogError(error.localizedDescription) + DDLogError("\(error.localizedDescription)") } let mediaRequestAuthenticator = MediaRequestAuthenticator() @@ -133,7 +133,7 @@ extension UIImageView { onComplete: { [weak self] request in self?.downloadSiteIcon(with: request, imageSize: imageSize, placeholderImage: placeholderImage) }) { error in - DDLogError(error.localizedDescription) + DDLogError("\(error.localizedDescription)") } } } diff --git a/WordPress/Classes/Services/CommentService+Likes.swift b/WordPress/Classes/Services/CommentService+Likes.swift index 188a623805ea..058be9add97b 100644 --- a/WordPress/Classes/Services/CommentService+Likes.swift +++ b/WordPress/Classes/Services/CommentService+Likes.swift @@ -46,7 +46,7 @@ extension CommentService { success(users, totalLikes.intValue, count) } }, failure: { error in - DDLogError(String(describing: error)) + DDLogError("\(String(describing: error))") failure(error) }) } diff --git a/WordPress/Classes/Services/Domains/DomainsService.swift b/WordPress/Classes/Services/Domains/DomainsService.swift index bf3a27151042..ebe8e39ededf 100644 --- a/WordPress/Classes/Services/Domains/DomainsService.swift +++ b/WordPress/Classes/Services/Domains/DomainsService.swift @@ -162,7 +162,7 @@ struct DomainsService { guard let blog = try? Blog.lookup(withID: siteID, in: context) else { let error = "Tried to obtain a Blog for a non-existing site (ID: \(siteID))" assertionFailure(error) - DDLogError(error) + DDLogError("\(error)") return nil } diff --git a/WordPress/Classes/Services/GravatarService.swift b/WordPress/Classes/Services/GravatarService.swift index 53b82c8bb8b0..719c92f931b5 100644 --- a/WordPress/Classes/Services/GravatarService.swift +++ b/WordPress/Classes/Services/GravatarService.swift @@ -44,7 +44,7 @@ public class GravatarService { onCompletion(profile) }, failure: { error in - DDLogError(error.debugDescription) + DDLogError("\(error.debugDescription)") onCompletion(nil) }) } diff --git a/WordPress/Classes/Services/PeopleService.swift b/WordPress/Classes/Services/PeopleService.swift index af50f15c6c6c..12af578c6811 100644 --- a/WordPress/Classes/Services/PeopleService.swift +++ b/WordPress/Classes/Services/PeopleService.swift @@ -49,7 +49,7 @@ struct PeopleService { success(users.count, hasMore) }, on: .main) }, failure: { error in - DDLogError(String(describing: error)) + DDLogError("\(String(describing: error))") failure?(error) }) } @@ -70,7 +70,7 @@ struct PeopleService { success(followers.count, hasMore) }, on: .main) }, failure: { error in - DDLogError(String(describing: error)) + DDLogError("\(String(describing: error))") failure?(error) }) } @@ -91,7 +91,7 @@ struct PeopleService { success(viewers.count, hasMore) }, on: .main) }, failure: { error in - DDLogError(String(describing: error)) + DDLogError("\(String(describing: error))") failure?(error) }) } diff --git a/WordPress/Classes/Services/PlanService.swift b/WordPress/Classes/Services/PlanService.swift index adf1b9df5666..c3e6c7349f66 100644 --- a/WordPress/Classes/Services/PlanService.swift +++ b/WordPress/Classes/Services/PlanService.swift @@ -235,7 +235,7 @@ private struct PlanStorage { guard let blogInContext = try? context.existingObject(with: blog.objectID) as? Blog else { let error = "Tried to update a plan for a non-existing site" assertionFailure(error) - DDLogError(error) + DDLogError("\(error)") return } if blogInContext.hasDomainCredit != hasDomainCredit { diff --git a/WordPress/Classes/Services/PostService+Likes.swift b/WordPress/Classes/Services/PostService+Likes.swift index 97cb37375d40..6718b1d72de5 100644 --- a/WordPress/Classes/Services/PostService+Likes.swift +++ b/WordPress/Classes/Services/PostService+Likes.swift @@ -44,7 +44,7 @@ extension PostService { success(users, totalLikes.intValue, count) } }, failure: { error in - DDLogError(String(describing: error)) + DDLogError("\(String(describing: error))") failure(error) }) } diff --git a/WordPress/Classes/Services/UsersService.swift b/WordPress/Classes/Services/UsersService.swift index 985c1a63c991..7a7974f2eb1d 100644 --- a/WordPress/Classes/Services/UsersService.swift +++ b/WordPress/Classes/Services/UsersService.swift @@ -51,7 +51,7 @@ open class UsersService { onCompletion(profile) }, failure: { error in - DDLogError(error.debugDescription) + DDLogError("\(error.debugDescription)") onCompletion(nil) }) } diff --git a/WordPress/Classes/Stores/ActivityStore.swift b/WordPress/Classes/Stores/ActivityStore.swift index e64782963639..460729ff4795 100644 --- a/WordPress/Classes/Stores/ActivityStore.swift +++ b/WordPress/Classes/Stores/ActivityStore.swift @@ -105,7 +105,7 @@ class ActivityStore: QueryStore { } override func logError(_ error: String) { - DDLogError(error) + DDLogError("\(error)") } func processQueries() { diff --git a/WordPress/Classes/Stores/PluginStore.swift b/WordPress/Classes/Stores/PluginStore.swift index 57547a57a436..8fcb1e274daf 100644 --- a/WordPress/Classes/Stores/PluginStore.swift +++ b/WordPress/Classes/Stores/PluginStore.swift @@ -208,7 +208,7 @@ class PluginStore: QueryStore { } override func logError(_ error: String) { - DDLogError(error) + DDLogError("\(error)") } func processQueries() { diff --git a/WordPress/Classes/Utility/AccountHelper.swift b/WordPress/Classes/Utility/AccountHelper.swift index 82d1a62776df..55e4a567c334 100644 --- a/WordPress/Classes/Utility/AccountHelper.swift +++ b/WordPress/Classes/Utility/AccountHelper.swift @@ -69,8 +69,7 @@ import Foundation }).joined(separator: "\n") let blogTreeDescription = !blogsByAccount.isEmpty ? blogTree : "No account/blogs configured on device" - let result = accountsDescription + "\nAll accounts and blogs:\n" + blogTreeDescription - DDLogInfo(result) + DDLogInfo("\(accountsDescription)\nAll accounts and blogs:\n\(blogTreeDescription)") } static func logOutDefaultWordPressComAccount() { diff --git a/WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift b/WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift index d3b316b893b6..869571acaa62 100644 --- a/WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift +++ b/WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift @@ -380,7 +380,7 @@ class BloggingRemindersScheduler { notificationScheduler.add(request) { (error) in if let error = error { - DDLogError(error.localizedDescription) + DDLogError("\(error)") } } diff --git a/WordPress/Classes/Utility/Logging/WordPressLibraryLogger.swift b/WordPress/Classes/Utility/Logging/WordPressLibraryLogger.swift index ffb4e72b23b3..5510b99c1258 100644 --- a/WordPress/Classes/Utility/Logging/WordPressLibraryLogger.swift +++ b/WordPress/Classes/Utility/Logging/WordPressLibraryLogger.swift @@ -5,22 +5,22 @@ import WordPressKit class WordPressLibraryLogger: NSObject, TracksLoggingDelegate, WordPressLoggingDelegate, WordPressKitLoggingDelegate { func logError(_ str: String) { - DDLogError(str) + DDLogError("\(str)") } func logWarning(_ str: String) { - DDLogWarn(str) + DDLogWarn("\(str)") } func logInfo(_ str: String) { - DDLogInfo(str) + DDLogInfo("\(str)") } func logDebug(_ str: String) { - DDLogDebug(str) + DDLogDebug("\(str)") } func logVerbose(_ str: String) { - DDLogVerbose(str) + DDLogVerbose("\(str)") } } diff --git a/WordPress/Classes/Utility/PingHubManager.swift b/WordPress/Classes/Utility/PingHubManager.swift index 7ef3a7598556..b98c37635463 100644 --- a/WordPress/Classes/Utility/PingHubManager.swift +++ b/WordPress/Classes/Utility/PingHubManager.swift @@ -265,7 +265,7 @@ extension PingHubManager: PinghubClientDelegate { } func pinghub(_ client: PinghubClient, unexpected message: PinghubClient.Unexpected) { - DDLogError(message.description) + DDLogError("\(message.description)") } } diff --git a/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift b/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift index f13561cd9681..0639df45c592 100644 --- a/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift +++ b/WordPress/Classes/Utility/Universal Links/Routes+Reader.swift @@ -204,7 +204,7 @@ private extension RootViewPresenter { } completion(topic) }, failure: { error in - DDLogError("Reader: Error retriving site topic - " + (error?.localizedDescription ?? "unknown failure reason")) + DDLogError("Reader: Error retriving site topic - \(error?.localizedDescription ?? "unknown failure reason")") completion(nil) }) } diff --git a/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift b/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift index 055447117afb..72285aebde46 100644 --- a/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift +++ b/WordPress/Classes/ViewRelated/Blog/SharingButtonsViewController.swift @@ -543,7 +543,7 @@ import WordPressShared }, failure: { [weak self] (error: Error) in let error = error as NSError - DDLogError(error.description) + DDLogError("\(error.description)") self?.showErrorSyncingMessage(error) }) } @@ -558,7 +558,7 @@ import WordPressShared self?.reloadButtons() }, failure: { (error: NSError?) in - DDLogError((error?.description)!) + DDLogError("\(String(describing: error))") }) } @@ -572,7 +572,7 @@ import WordPressShared }, failure: { (error: Error) in let error = error as NSError - DDLogError(error.description) + DDLogError("\(error.description)") }) } @@ -658,7 +658,7 @@ import WordPressShared } }, failure: { [weak self] (error: NSError?) in - DDLogError((error?.description)!) + DDLogError("\(String(describing: error))") self?.showErrorSyncingMessage(error) }) } diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 11406d9ac8cd..1686a2b409af 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -881,15 +881,15 @@ extension GutenbergViewController: GutenbergBridgeDelegate { func gutenbergDidEmitLog(message: String, logLevel: LogLevel) { switch logLevel { case .trace: - DDLogDebug(message) + DDLogDebug("\(message)") case .info: - DDLogInfo(message) + DDLogInfo("\(message)") case .warn: - DDLogWarn(message) + DDLogWarn("\(message)") case .error, .fatal: - DDLogError(message) + DDLogError("\(message)") @unknown default: - fatalError() + DDLogInfo("\(message)") } } diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergWeb/GutenbergWebNavigationViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergWeb/GutenbergWebNavigationViewController.swift index c90ec306a1b7..4da3491ea97e 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergWeb/GutenbergWebNavigationViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergWeb/GutenbergWebNavigationViewController.swift @@ -61,7 +61,7 @@ extension GutenbergWebNavigationController: GutenbergWebDelegate { } func webController(controller: GutenbergWebSingleBlockViewController, didLog log: String) { - DDLogVerbose(log) + DDLogVerbose("\(log)") } private func dismiss(webController: GutenbergWebSingleBlockViewController) { diff --git a/WordPress/Classes/ViewRelated/Jetpack/Install/Webview/JetpackConnectionWebViewController.swift b/WordPress/Classes/ViewRelated/Jetpack/Install/Webview/JetpackConnectionWebViewController.swift index e758e1ba9be3..40a78ed287a0 100644 --- a/WordPress/Classes/ViewRelated/Jetpack/Install/Webview/JetpackConnectionWebViewController.swift +++ b/WordPress/Classes/ViewRelated/Jetpack/Install/Webview/JetpackConnectionWebViewController.swift @@ -349,7 +349,7 @@ private extension JetpackConnectionWebViewController { guard enabled else { return } - DDLogDebug(message) + DDLogDebug("\(message)") } } } diff --git a/WordPress/Classes/ViewRelated/Me/Me Main/MeViewController.swift b/WordPress/Classes/ViewRelated/Me/Me Main/MeViewController.swift index 7d0d5bf284da..b6e7a7ca1b8a 100644 --- a/WordPress/Classes/ViewRelated/Me/Me Main/MeViewController.swift +++ b/WordPress/Classes/ViewRelated/Me/Me Main/MeViewController.swift @@ -274,7 +274,7 @@ class MeViewController: UITableViewController { guard let account = self.defaultAccount() else { let error = "Tried to push My Profile without a default account. This shouldn't happen" assertionFailure(error) - DDLogError(error) + DDLogError("\(error)") return nil } @@ -500,7 +500,7 @@ class MeViewController: UITableViewController { let _ = try await [refreshDetails, refreshSettings] self.reloadViewModel() } catch let error { - DDLogError(error.localizedDescription) + DDLogError("\(error.localizedDescription)") } } } diff --git a/WordPress/Classes/ViewRelated/Plans/PlanListViewController.swift b/WordPress/Classes/ViewRelated/Plans/PlanListViewController.swift index 00051d40add1..b7dbaf5027e0 100644 --- a/WordPress/Classes/ViewRelated/Plans/PlanListViewController.swift +++ b/WordPress/Classes/ViewRelated/Plans/PlanListViewController.swift @@ -49,7 +49,7 @@ final class PlanListViewController: UITableViewController, ImmuTablePresenter { self?.updateViewModel() }, failure: { error in - DDLogInfo(error.debugDescription) + DDLogInfo("\(error.debugDescription)") }) } diff --git a/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift b/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift index 827bb3776502..9050fb814f10 100644 --- a/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift +++ b/WordPress/Classes/ViewRelated/Reader/Filter/FilterProvider.swift @@ -363,7 +363,7 @@ extension ReaderTagTopic { } completion(.success(topics)) } catch { - DDLogError("There was a problem fetching followed tags." + error.localizedDescription) + DDLogError("There was a problem fetching followed tags. \(error.localizedDescription)") completion(.failure(error)) } } diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderActionHelpers.swift b/WordPress/Classes/ViewRelated/Reader/ReaderActionHelpers.swift index 2b789587f1d1..ad9c24733a4c 100644 --- a/WordPress/Classes/ViewRelated/Reader/ReaderActionHelpers.swift +++ b/WordPress/Classes/ViewRelated/Reader/ReaderActionHelpers.swift @@ -8,7 +8,7 @@ struct ReaderActionHelpers { do { return (try context.existingObject(with: objectID)) as? T } catch let error as NSError { - DDLogError(error.localizedDescription) + DDLogError("\(error.localizedDescription)") return nil } } diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderPostCardCellViewModel.swift b/WordPress/Classes/ViewRelated/Reader/ReaderPostCardCellViewModel.swift index c297ef86a0f9..2b94c9e0cc83 100644 --- a/WordPress/Classes/ViewRelated/Reader/ReaderPostCardCellViewModel.swift +++ b/WordPress/Classes/ViewRelated/Reader/ReaderPostCardCellViewModel.swift @@ -161,7 +161,7 @@ struct ReaderPostCardCellViewModel { let request = try await mediaRequestAuthenticator.authenticatedRequest(for: url, host: host) await imageView.downloadImage(usingRequest: request) } catch { - DDLogError(error) + DDLogError("\(error)") } } } @@ -172,7 +172,7 @@ struct ReaderPostCardCellViewModel { } let imageSize = featuredImageIdealSize ?? size let host = MediaHost(with: contentProvider, failure: { error in - DDLogError(error) + DDLogError("\(error)") }) imageLoader.loadImage(with: url, from: host, preferredSize: imageSize) } diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderTagCell.swift b/WordPress/Classes/ViewRelated/Reader/ReaderTagCell.swift index be6d7abb224f..4181140c6606 100644 --- a/WordPress/Classes/ViewRelated/Reader/ReaderTagCell.swift +++ b/WordPress/Classes/ViewRelated/Reader/ReaderTagCell.swift @@ -101,7 +101,7 @@ private extension ReaderTagCell { let imageSize = CGSize(width: featuredImageView.frame.width, height: featuredImageView.frame.height) let host = MediaHost(with: post, failure: { error in - DDLogError(error) + DDLogError("\(error)") }) imageLoader.loadImage(with: url, from: host, preferredSize: imageSize) } diff --git a/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabItemsStore.swift b/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabItemsStore.swift index a98bc59a67f4..3115b046ff07 100644 --- a/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabItemsStore.swift +++ b/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabItemsStore.swift @@ -70,7 +70,7 @@ extension ReaderTabItemsStore { let items = ReaderHelpers.rearrange(items: topics.map { ReaderTabItem(ReaderContent(topic: $0)) }) self.state = .ready(items) } catch { - DDLogError(ReaderTopicsConstants.fetchRequestError + error.localizedDescription) + DDLogError("\(ReaderTopicsConstants.fetchRequestError)\(error.localizedDescription)") self.state = .error(error) } } diff --git a/WordPress/Jetpack/Classes/Utility/DataMigrator.swift b/WordPress/Jetpack/Classes/Utility/DataMigrator.swift index 6c65c92c6dec..59782a42f88c 100644 --- a/WordPress/Jetpack/Classes/Utility/DataMigrator.swift +++ b/WordPress/Jetpack/Classes/Utility/DataMigrator.swift @@ -169,7 +169,7 @@ private extension DataMigrator { private func log(error: DataMigrationError, userInfo: [String: Any] = [:]) { let userInfo = userInfo.merging(self.userInfo(for: error)) { $1 } - DDLogError(error) + DDLogError("\(error)") crashLogger.logError(error, userInfo: userInfo, level: .error) } diff --git a/WordPress/WordPressShareExtension/AppExtensionsService.swift b/WordPress/WordPressShareExtension/AppExtensionsService.swift index 11ed2714753a..9ea97b190418 100644 --- a/WordPress/WordPressShareExtension/AppExtensionsService.swift +++ b/WordPress/WordPressShareExtension/AppExtensionsService.swift @@ -473,7 +473,7 @@ fileprivate extension AppExtensionsService { if let error = error as NSError? { errorString += ": \(error.localizedDescription)" } - DDLogError(errorString) + DDLogError("\(errorString)") self.coreDataStack.updateStatus(.error, forUploadOpWithObjectID: uploadOpObjectID) onFailure?() }) @@ -496,7 +496,7 @@ fileprivate extension AppExtensionsService { if let error = error as NSError? { errorString += ": \(error.localizedDescription)" } - DDLogError(errorString) + DDLogError("\(errorString)") syncGroup.leave() }) } diff --git a/WordPress/WordPressShareExtension/ShareExtensionSessionManager.swift b/WordPress/WordPressShareExtension/ShareExtensionSessionManager.swift index 27d67288465d..bba76ac37bdc 100644 --- a/WordPress/WordPressShareExtension/ShareExtensionSessionManager.swift +++ b/WordPress/WordPressShareExtension/ShareExtensionSessionManager.swift @@ -144,7 +144,7 @@ import WordPressFlux guard uploadOpObjectIDs.count > 0 else { return } - DDLogError(errorString) + DDLogError("\(errorString)") for uploadOpObjectID in uploadOpObjectIDs { coreDataStack.updateStatus(.error, forUploadOpWithObjectID: uploadOpObjectID) } @@ -273,7 +273,7 @@ import WordPressFlux if let error = error as NSError? { errorString += ": \(error.localizedDescription)" } - DDLogError(errorString) + DDLogError("\(errorString)") syncGroup.leave() }) }