From f1708c0b3074c2d97ffebf97c6611396e34e359d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 19 Jun 2018 17:01:46 -0400 Subject: [PATCH] Improve logging around deserialization failures. --- SignalServiceKit/src/Storage/OWSStorage.m | 7 ++++--- SignalServiceKit/src/Util/OWSAnalytics.m | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m index c8f9aa026..ffb2991e3 100644 --- a/SignalServiceKit/src/Storage/OWSStorage.m +++ b/SignalServiceKit/src/Storage/OWSStorage.m @@ -230,8 +230,8 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_ cannotDecodeObjectOfClassName:(NSString *)name originalClasses:(NSArray *)classNames { - DDLogError(@"%@ Could not decode object: %@", self.logTag, name); - OWSProdError([OWSAnalyticsEvents storageErrorCouldNotDecodeClass]); + OWSProdLogAndFail(@"%@ Could not decode object: %@", self.logTag, name); + OWSProdCritical([OWSAnalyticsEvents storageErrorCouldNotDecodeClass]); return [OWSUnknownDBObject class]; } @@ -458,7 +458,8 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_ return [unarchiver decodeObjectForKey:@"root"]; } @catch (NSException *exception) { // Sync log in case we bail. - OWSProdError([OWSAnalyticsEvents storageErrorDeserialization]); + OWSProdLogAndFail(@"%@ error deserializing object: %@", self.logTag, collection); + OWSProdCritical([OWSAnalyticsEvents storageErrorDeserialization]); @throw exception; } }; diff --git a/SignalServiceKit/src/Util/OWSAnalytics.m b/SignalServiceKit/src/Util/OWSAnalytics.m index 191208f7a..e819a8673 100755 --- a/SignalServiceKit/src/Util/OWSAnalytics.m +++ b/SignalServiceKit/src/Util/OWSAnalytics.m @@ -399,7 +399,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity) - (BOOL)isSeverityAsync:(OWSAnalyticsSeverity)severity { - return severity == OWSAnalyticsSeverityCritical; + return severity != OWSAnalyticsSeverityCritical; } #pragma mark - Logging