Skip to content

Commit fb93843

Browse files
committed
Re-introduce ASL in the functions names
1 parent 8264390 commit fb93843

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

Example/Core/Tests/FIRLoggerTest.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ @interface FIRLoggerTest : FIRTestCase
2020
@end
2121

2222
@implementation FIRLoggerTest
23-
// TODO(bstpierre):Create FIRLogger tests which do not depend on GULLogger implementation details.
23+
24+
// TODO(bstpierre): Test FIRLogger functionality separate from GULLogger.
2425
@end

Firebase/Core/FIRLogger.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
static NSRegularExpression *sMessageCodeRegex;
6565
#endif
6666

67-
void FIRLoggerInitialize() {
67+
void FIRLoggerInitializeASL() {
6868
dispatch_once(&sFIRLoggerOnceToken, ^{
6969
// Register Firebase Version with GULLogger.
7070
GULLoggerRegisterVersion(FIRVersionString);
@@ -87,7 +87,7 @@ void FIRLoggerInitialize() {
8787
[sFIRLoggerUserDefaults setBool:YES forKey:kFIRPersistedDebugModeKey];
8888
forceDebugMode = YES;
8989
}
90-
GULLoggerInitialize();
90+
GULLoggerInitializeASL();
9191
if (overrideSTDERR) {
9292
GULLoggerEnableSTDERR();
9393
}
@@ -102,7 +102,7 @@ void FIRLoggerInitialize() {
102102
}
103103

104104
void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel) {
105-
FIRLoggerInitialize();
105+
FIRLoggerInitializeASL();
106106
GULSetLoggerLevel((GULLoggerLevel)loggerLevel);
107107
}
108108

@@ -114,7 +114,7 @@ void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel) {
114114
*/
115115
__attribute__((no_sanitize("thread"))) BOOL FIRIsLoggableLevel(FIRLoggerLevel loggerLevel,
116116
BOOL analyticsComponent) {
117-
FIRLoggerInitialize();
117+
FIRLoggerInitializeASL();
118118
if (sFIRAnalyticsDebugMode && analyticsComponent) {
119119
return YES;
120120
}
@@ -126,7 +126,7 @@ void FIRLogBasic(FIRLoggerLevel level,
126126
NSString *messageCode,
127127
NSString *message,
128128
va_list args_ptr) {
129-
FIRLoggerInitialize();
129+
FIRLoggerInitializeASL();
130130
GULLogBasic((GULLoggerLevel)level, service,
131131
sFIRAnalyticsDebugMode && [kFIRLoggerAnalytics isEqualToString:service], messageCode,
132132
message, args_ptr);

GoogleUtilities/Logger/GULLogger.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ void GULLoggerInitialize(void) {
2525
[GULLogger.logger initializeLogger];
2626
}
2727

28+
void GULLoggerInitializeASL(void) {
29+
GULLoggerInitialize();
30+
}
31+
2832
void GULLoggerEnableSTDERR(void) {
2933
[GULLogger.logger printToSTDERR];
3034
}

GoogleUtilities/Logger/Private/GULLogger.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,20 @@ extern "C" {
2828

2929
/**
3030
* Initialize the default GULLogger.
31+
*
32+
* @discussion On iOS 9 and earlier. GULLogger will use ASL. For iOS 10 and later, os_log is used.
3133
*/
3234
extern void GULLoggerInitialize(void);
3335

36+
/**
37+
* Initialize GULLogger.
38+
*
39+
* @discussion This version should no longer be used. ASL is deprecated by Apple to be replaced by
40+
* os_log. Calls to this function are redirected to GULLoggerInitialize to ensure
41+
* functionality on all iOS versions.
42+
*/
43+
extern void GULLoggerInitializeASL(void);
44+
3445
/**
3546
* Override log level to Debug.
3647
*/

0 commit comments

Comments
 (0)