Skip to content

Commit fd11b6f

Browse files
maksymmalyhinCorrob
authored andcommitted
GULLogger: logged issue counting concurrency issue fix (#2627)
1 parent 84f1a0c commit fd11b6f

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

GoogleUtilities/Example/Tests/Logger/GULLoggerTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
extern BOOL getGULLoggerDebugMode(void);
3434

35-
extern CFStringRef getGULLoggerUsetDefaultsSuiteName(void);
35+
extern CFStringRef getGULLoggerUserDefaultsSuiteName(void);
3636
extern dispatch_queue_t getGULLoggerCounterQueue(void);
3737

3838
static NSString *const kMessageCode = @"I-COR000001";
@@ -51,7 +51,7 @@ - (void)setUp {
5151
GULResetLogger();
5252

5353
self.loggerDefaults = [[NSUserDefaults alloc]
54-
initWithSuiteName:CFBridgingRelease(getGULLoggerUsetDefaultsSuiteName())];
54+
initWithSuiteName:CFBridgingRelease(getGULLoggerUserDefaultsSuiteName())];
5555
}
5656

5757
- (void)tearDown {

GoogleUtilities/Logger/GULLogger.m

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@ void GULLogBasic(GULLoggerLevel level,
207207

208208
// NSUserDefaults cannot be used due to a bug described in GULUserDefaults
209209
// GULUserDefaults cannot be used because GULLogger is a dependency for GULUserDefaults
210-
// We have to use C API deireclty here
210+
// We have to use C API direclty here
211211

212-
CFStringRef getGULLoggerUsetDefaultsSuiteName(void) {
212+
CFStringRef getGULLoggerUserDefaultsSuiteName(void) {
213213
return (__bridge CFStringRef) @"GoogleUtilities.Logger.GULLogger";
214214
}
215215

216216
NSInteger GULGetUserDefaultsIntegerForKey(NSString *key) {
217217
id value = (__bridge_transfer id)CFPreferencesCopyAppValue((__bridge CFStringRef)key,
218-
getGULLoggerUsetDefaultsSuiteName());
218+
getGULLoggerUserDefaultsSuiteName());
219219
if (![value isKindOfClass:[NSNumber class]]) {
220220
return 0;
221221
}
@@ -226,8 +226,8 @@ NSInteger GULGetUserDefaultsIntegerForKey(NSString *key) {
226226
void GULLoggerUserDefaultsSetIntegerForKey(NSInteger count, NSString *key) {
227227
NSNumber *countNumber = @(count);
228228
CFPreferencesSetAppValue((__bridge CFStringRef)key, (__bridge CFNumberRef)countNumber,
229-
getGULLoggerUsetDefaultsSuiteName());
230-
CFPreferencesAppSynchronize(getGULLoggerUsetDefaultsSuiteName());
229+
getGULLoggerUserDefaultsSuiteName());
230+
CFPreferencesAppSynchronize(getGULLoggerUserDefaultsSuiteName());
231231
}
232232

233233
#pragma mark - Number of errors and warnings
@@ -238,8 +238,6 @@ dispatch_queue_t getGULLoggerCounterQueue(void) {
238238
dispatch_once(&onceToken, ^{
239239
queue =
240240
dispatch_queue_create("GoogleUtilities.GULLogger.counterQueue", DISPATCH_QUEUE_CONCURRENT);
241-
dispatch_set_target_queue(queue,
242-
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
243241
});
244242

245243
return queue;

0 commit comments

Comments
 (0)