Respond to CR.

pull/1/head
Matthew Chen 7 years ago
parent 2e6b4899a7
commit b88254244a

@ -1 +1 @@
Subproject commit 9f01282113e10d50ff87e76ee5fa8d2c09d19f7f
Subproject commit 5caa906cfd9c24f464247747004cc8335b96040c

@ -340,7 +340,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
}
};
if ([self isSeverityAsync:severity]) {
if ([self shouldReportAsync:severity]) {
dispatch_async(self.serialQueue, addEvent);
} else {
dispatch_sync(self.serialQueue, addEvent);
@ -383,12 +383,19 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
// Log the event.
NSString *logString = [NSString stringWithFormat:@"%s:%d %@", location, line, eventName];
if (!parameters) {
LOG_MAYBE([self isSeverityAsync:severity], LOG_LEVEL_DEF, logFlag, 0, nil, location, @"%@", logString);
LOG_MAYBE([self shouldReportAsync:severity], LOG_LEVEL_DEF, logFlag, 0, nil, location, @"%@", logString);
} else {
LOG_MAYBE(
[self isSeverityAsync:severity], LOG_LEVEL_DEF, logFlag, 0, nil, location, @"%@ %@", logString, parameters);
LOG_MAYBE([self shouldReportAsync:severity],
LOG_LEVEL_DEF,
logFlag,
0,
nil,
location,
@"%@ %@",
logString,
parameters);
}
if (![self isSeverityAsync:severity]) {
if (![self shouldReportAsync:severity]) {
[DDLog flushLog];
}
@ -397,7 +404,7 @@ NSString *NSStringForOWSAnalyticsSeverity(OWSAnalyticsSeverity severity)
[self addEvent:eventName severity:severity properties:eventProperties];
}
- (BOOL)isSeverityAsync:(OWSAnalyticsSeverity)severity
- (BOOL)shouldReportAsync:(OWSAnalyticsSeverity)severity
{
return severity != OWSAnalyticsSeverityCritical;
}

Loading…
Cancel
Save