status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use getters and setters 

Summary: As per discussion in #2423 - possible fix for crash. (cc: @​javache)

Please share feedback regarding the PR, we are going to be using this diff in production to see if it fixes the crashes we are seeing.

(fixes #2423)
Closes https://github.com/facebook/react-native/pull/2494

Reviewed By: @javache

Differential Revision: D2433515

Pulled By: @nicklockwood
This commit is contained in:
Param Aggarwal 2015-09-13 11:08:44 -07:00 committed by facebook-github-bot-3
parent 9d36fc6a71
commit b998e5a7b7
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
React/Base/RCTLog.m
View File

@ -35,17 +35,16 @@ const char *RCTLogLevels[] = {
static RCTLogFunction RCTCurrentLogFunction;
static RCTLogLevel RCTCurrentLogThreshold;
__attribute__((constructor))
static void RCTLogSetup()
RCTLogLevel RCTGetLogThreshold()
{
RCTCurrentLogFunction = RCTDefaultLogFunction;
if (!RCTCurrentLogThreshold) {
#if RCT_DEBUG
RCTCurrentLogThreshold = RCTLogLevelInfo - 1;
RCTCurrentLogThreshold = RCTLogLevelInfo - 1;
#else
RCTCurrentLogThreshold = RCTLogLevelError;
RCTCurrentLogThreshold = RCTLogLevelError;
#endif
}
return RCTCurrentLogThreshold;
}
RCTLogFunction RCTDefaultLogFunction = ^(
@ -88,23 +87,26 @@ void RCTSetLogFunction(RCTLogFunction logFunction)
RCTLogFunction RCTGetLogFunction()
{
if (!RCTCurrentLogFunction) {
RCTCurrentLogFunction = RCTDefaultLogFunction;
}
return RCTCurrentLogFunction;
}
void RCTAddLogFunction(RCTLogFunction logFunction)
{
RCTLogFunction existing = RCTCurrentLogFunction;
RCTLogFunction existing = RCTGetLogFunction();
if (existing) {
RCTCurrentLogFunction = ^(RCTLogLevel level,
NSString *fileName,
NSNumber *lineNumber,
NSString *message) {
RCTSetLogFunction(^(RCTLogLevel level,
NSString *fileName,
NSNumber *lineNumber,
NSString *message) {
existing(level, fileName, lineNumber, message);
logFunction(level, fileName, lineNumber, message);
};
});
} else {
RCTCurrentLogFunction = logFunction;
RCTSetLogFunction(logFunction);
}
}
@ -120,7 +122,7 @@ static RCTLogFunction RCTGetLocalLogFunction()
if (logFunction) {
return logFunction;
}
return RCTCurrentLogFunction;
return RCTGetLogFunction();
}
void RCTPerformBlockWithLogFunction(void (^block)(void), RCTLogFunction logFunction)
@ -194,7 +196,7 @@ void _RCTLogFormat(
{
RCTLogFunction logFunction = RCTGetLocalLogFunction();
BOOL log = RCT_DEBUG || (logFunction != nil);
if (log && level >= RCTCurrentLogThreshold) {
if (log && level >= RCTGetLogThreshold()) {
// Get message
va_list args;