Skip to content

Don't allow logger version deallocation #6719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2020
Merged

Don't allow logger version deallocation #6719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FirebaseCore/Sources/FIRLogger.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
void FIRLoggerInitializeASL() {
dispatch_once(&sFIRLoggerOnceToken, ^{
// Register Firebase Version with GULLogger.
GULLoggerRegisterVersion([FIRFirebaseVersion() UTF8String]);
GULLoggerRegisterVersion(FIRFirebaseVersion());

// Override the aslOptions to ASL_OPT_STDERR if the override argument is passed in.
NSArray *arguments = [NSProcessInfo processInfo].arguments;
Expand Down
6 changes: 3 additions & 3 deletions GoogleUtilities/Logger/GULLogger.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
static GULLoggerLevel sGULLoggerMaximumLevel;

// Allow clients to register a version to include in the log.
static const char *sVersion = "";
static NSString *sVersion = @"";

static GULLoggerService kGULLoggerLogger = @"[GULLogger]";

Expand Down Expand Up @@ -139,7 +139,7 @@ BOOL getGULLoggerDebugMode() {
}
#endif

void GULLoggerRegisterVersion(const char *version) {
void GULLoggerRegisterVersion(NSString *version) {
sVersion = version;
}

Expand Down Expand Up @@ -168,7 +168,7 @@ void GULLogBasic(GULLoggerLevel level,
} else {
logMsg = [[NSString alloc] initWithFormat:message arguments:args_ptr];
}
logMsg = [NSString stringWithFormat:@"%s - %@[%@] %@", sVersion, service, messageCode, logMsg];
logMsg = [NSString stringWithFormat:@"%@ - %@[%@] %@", sVersion, service, messageCode, logMsg];
dispatch_async(sGULClientQueue, ^{
asl_log(sGULLoggerClient, NULL, (int)level, "%s", logMsg.UTF8String);
});
Expand Down
2 changes: 1 addition & 1 deletion GoogleUtilities/Logger/Public/GoogleUtilities/GULLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extern BOOL GULIsLoggableLevel(GULLoggerLevel loggerLevel);
* Register version to include in logs.
* (required) version
*/
extern void GULLoggerRegisterVersion(const char *version);
extern void GULLoggerRegisterVersion(NSString *version);

/**
* Logs a message to the Xcode console and the device log. If running from AppStore, will
Expand Down