From 01a503f3bf3df89a5b4d6fc62accd50b0a8e85de Mon Sep 17 00:00:00 2001 From: Icaro Motta Date: Tue, 23 Apr 2024 09:53:07 -0300 Subject: [PATCH] Log signals from the Clojure layer instead of native code (#19683) We log the entire signal data when it arrives from status-go in the native layer, where our Clojure logging mechanism is unavailable. Sometimes, the developer may not want that much noise during development, e.g. when managing integration or contract tests. This commit removes the native calls to log signals and adds a timbre (log/debug ...) call in the event handler :signals/signal-received. We know timbre will elide log calls at compile time given the minimum log level set, therefore, we don't need to worry about performance because we will log signals at the debug level only. --- .../src/main/java/im/status/ethereum/module/StatusModule.kt | 1 - modules/react-native-status/ios/RCTStatus/RCTStatus.m | 3 --- modules/react-native-status/nodejs/status.cpp | 2 -- src/status_im/common/signals/events.cljs | 1 + 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.kt b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.kt index 65df036fb7..af80b40d00 100644 --- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.kt +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.kt @@ -43,7 +43,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va } override fun handleSignal(jsonEventString: String) { - Log.d(TAG, "Signal event") val params = Arguments.createMap() params.putString("jsonEvent", jsonEventString) reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params) diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m index d3a9360182..9a9bbf95ba 100644 --- a/modules/react-native-status/ios/RCTStatus/RCTStatus.m +++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.m @@ -38,9 +38,6 @@ static RCTBridge *bridge; return; } -#if DEBUG - NSLog(@"[handleSignal] Received an event from Status-Go: %@", signal); -#endif [bridge.eventDispatcher sendAppEventWithName:@"gethEvent" body:@{@"jsonEvent": signal}]; diff --git a/modules/react-native-status/nodejs/status.cpp b/modules/react-native-status/nodejs/status.cpp index e6881e3c7e..c4bcb21407 100644 --- a/modules/react-native-status/nodejs/status.cpp +++ b/modules/react-native-status/nodejs/status.cpp @@ -1128,8 +1128,6 @@ Persistent r_call; std::queue q; void run(char *json) { - printf("signal received %s\n", json); - std::string str(json); q.push(str); } diff --git a/src/status_im/common/signals/events.cljs b/src/status_im/common/signals/events.cljs index 3f1f3b9bf7..4f3a96ae52 100644 --- a/src/status_im/common/signals/events.cljs +++ b/src/status_im/common/signals/events.cljs @@ -35,6 +35,7 @@ (let [^js data (.parse js/JSON event-str) ^js event-js (.-event data) type (.-type data)] + (log/debug "Signal received" event-str) (case type "node.login" {:fx [[:dispatch [:profile.login/login-node-signal