Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Guard all debug logs behind an MC

Browse Source 
Reviewed By: PeteTheHeat

Differential Revision: D21292280

fbshipit-source-id: 1701a945f126f35a53417b57e3162372d39e75f1
This commit is contained in:
Ramanpreet Nara
2020-04-29 09:13:45 -07:00
committed by Facebook GitHub Bot
parent 3fb37b4326
commit 97bc0845ec
4 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+21 -15
View File
@@ -1252,32 +1252,38 @@ public class ReactInstanceManager {
reactContext.initializeWithInstance(catalystInstance);
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"ReactInstanceManager.createReactContext: mJSIModulePackage "
+ (mJSIModulePackage != null ? "not null" : "null"));
if (ReactFeatureFlags.enableTurboModuleDebugLogs) {
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"ReactInstanceManager.createReactContext: mJSIModulePackage "
+ (mJSIModulePackage != null ? "not null" : "null"));
}
if (mJSIModulePackage != null) {
catalystInstance.addJSIModules(
mJSIModulePackage.getJSIModules(
reactContext, catalystInstance.getJavaScriptContextHolder()));
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"ReactInstanceManager.createReactContext: ReactFeatureFlags.useTurboModules == "
+ (ReactFeatureFlags.useTurboModules == false ? "false" : "true"));
if (ReactFeatureFlags.enableTurboModuleDebugLogs) {
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"ReactInstanceManager.createReactContext: ReactFeatureFlags.useTurboModules == "
+ (ReactFeatureFlags.useTurboModules == false ? "false" : "true"));
}
if (ReactFeatureFlags.useTurboModules) {
JSIModule turboModuleManager =
catalystInstance.getJSIModule(JSIModuleType.TurboModuleManager);
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"ReactInstanceManager.createReactContext: TurboModuleManager "
+ (turboModuleManager == null ? "not created" : "created"));
if (ReactFeatureFlags.enableTurboModuleDebugLogs) {
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"ReactInstanceManager.createReactContext: TurboModuleManager "
+ (turboModuleManager == null ? "not created" : "created"));
}
catalystInstance.setTurboModuleManager(turboModuleManager);
ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+9 -7
View File
@@ -583,13 +583,15 @@ public class CatalystInstanceImpl implements CatalystInstance {
if (getTurboModuleRegistry() != null) {
TurboModule turboModule = getTurboModuleRegistry().getModule(moduleName);
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"CatalystInstanceImpl.getNativeModule: TurboModule "
+ moduleName
+ (turboModule == null ? " not" : "")
+ " found");
if (ReactFeatureFlags.enableTurboModuleDebugLogs) {
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"CatalystInstanceImpl.getNativeModule: TurboModule "
+ moduleName
+ (turboModule == null ? " not" : "")
+ " found");
}
if (turboModule != null) {
return (NativeModule) turboModule;
}
ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+3
View File
@@ -23,6 +23,9 @@ public class ReactFeatureFlags {
*/
public static volatile boolean useTurboModules = false;
/** Should we output debug logs to debug the TurboModule infra? */
public static volatile boolean enableTurboModuleDebugLogs = false;
/*
* This feature flag enables logs for Fabric
*/
ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java
+9 -5
View File
@@ -19,6 +19,7 @@ import com.facebook.react.bridge.JSIModule;
import com.facebook.react.bridge.JavaScriptContextHolder;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.config.ReactFeatureFlags;
import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
import com.facebook.react.turbomodule.core.interfaces.TurboModule;
import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry;
@@ -142,11 +143,14 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
* Always return null after cleanup has started, so that getModule(moduleName) returns null.
*/
FLog.e(
ReactConstants.TAG,
"TurboModuleManager.getOrMaybeCreateTurboModuleHolder: Tried to require TurboModule "
+ moduleName
+ " after cleanup initiated");
if (ReactFeatureFlags.enableTurboModuleDebugLogs) {
// TODO(T46487253): Remove after task is closed
FLog.e(
ReactConstants.TAG,
"TurboModuleManager.getOrMaybeCreateTurboModuleHolder: Tried to require TurboModule "
+ moduleName
+ " after cleanup initiated");
}
return null;
}