Improve logging around deserialization failures.

SignalServiceKit/src/Storage/OWSStorage.m

@@ -230,8 +230,8 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
     cannotDecodeObjectOfClassName:(NSString *)name
                   originalClasses:(NSArray<NSString *> *)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;
         }
     };

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