From e5bef7338f41a96e0dd5636b835ecdf7a60aa580 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 2 Jun 2020 20:09:28 -0700 Subject: [PATCH] Remove TurboModule debug logs Summary: These logs are no longer necessary, because data indicates that the TurboModule eager init crash was fixed. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D21852743 fbshipit-source-id: ddeefd6396283ee5e15980a33fb006cb83a81532 --- .../facebook/react/ReactInstanceManager.java | 24 ------------------- .../react/bridge/CatalystInstanceImpl.java | 10 -------- .../react/config/ReactFeatureFlags.java | 3 --- .../turbomodule/core/TurboModuleManager.java | 10 -------- 4 files changed, 47 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index b5cd517d068..46ce038b405 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1279,39 +1279,15 @@ public class ReactInstanceManager { reactContext.initializeWithInstance(catalystInstance); - 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())); - 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); - 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); TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index bf84f599d74..0a9e52b8f95 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -582,16 +582,6 @@ public class CatalystInstanceImpl implements CatalystInstance { public NativeModule getNativeModule(String moduleName) { if (getTurboModuleRegistry() != null) { TurboModule turboModule = getTurboModuleRegistry().getModule(moduleName); - - 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; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index 7705d229527..26025c3b4aa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -23,9 +23,6 @@ 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 */ diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java index 6b01a200830..bf1db2e6476 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java @@ -19,7 +19,6 @@ 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,15 +141,6 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { /* * Always return null after cleanup has started, so that getModule(moduleName) returns null. */ - - 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; }