fix(bridge): fix logger setup and ble init

berty · Apr 17, 2019 · 5c3b866 · 5c3b866
1 parent 685d5b7
commit 5c3b866
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/client/react-native/android/app/src/main/java/chat/berty/core/CoreModule.java b/client/react-native/android/app/src/main/java/chat/berty/core/CoreModule.java
@@ -24,18 +24,20 @@ public class CoreModule extends ReactContextBaseJavaModule {
     private ReactApplicationContext reactContext;
     private MobileNotification notificationDriver = Core.getNotificationDriver();
     private ConnectivityUpdateHandler connectivity;
-    private NativeBridge daemon = Core.newNativeBridge();
+    private NativeBridge daemon = Core.newNativeBridge(this.logger);
 
     public CoreModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
         this.reactContext = reactContext;
+
         String storagePath = reactContext.getFilesDir().getAbsolutePath();
         try {
             Core.getDeviceInfo().setStoragePath(storagePath);
         } catch (Exception error) {
             logger.format(Level.ERROR, this.getName(), error.getMessage());
         }
+
         this.notificationDriver.setNative(new NotificationNative());
 
         connectivity = new ConnectivityUpdateHandler(reactContext);

diff --git a/client/react-native/gomobile/core/bridge.go b/client/react-native/gomobile/core/bridge.go
@@ -51,12 +51,18 @@ type NativeBridge struct {
 
 // @FIXME: NewNativeBridge must  not panic, for now Initialize and Dial (should) never
 // return an error so it safe, but keep an eye on it.
-func NewNativeBridge() *NativeBridge {
+func NewNativeBridge(loggerNative NativeLogger) *NativeBridge {
 	bridge := daemon.New()
 	if _, err := bridge.Initialize(context.Background(), config); err != nil {
 		panic(err)
 	}
 
+	if err := setupLogger("debug", loggerNative); err != nil {
+		panic(err)
+	}
+
+	initBleFunc()
+
 	iogrpc := helper.NewIOGrpc()
 	dialer := iogrpc.NewDialer()
 	listener := iogrpc.Listener()

diff --git a/client/react-native/gomobile/core/core.go b/client/react-native/gomobile/core/core.go
@@ -76,7 +76,7 @@ func GetPort() (int, error) {
 func Initialize(loggerNative NativeLogger, datastorePath string) error {
 	defer panicHandler()
 
-	if err := setupLogger("debug", datastorePath, loggerNative); err != nil {
+	if err := setupLogger("debug", loggerNative); err != nil {
 		return err
 	}
 

diff --git a/client/react-native/gomobile/core/logger.go b/client/react-native/gomobile/core/logger.go
@@ -36,7 +36,7 @@ func (mc *mobileCore) Write(entry zapcore.Entry, fields []zapcore.Field) error {
 	return mc.l.Log(entry.Level.CapitalString(), entry.LoggerName, buff.String())
 }
 
-func setupLogger(logLevel, datastorePath string, mlogger NativeLogger) error {
+func setupLogger(logLevel string, mlogger NativeLogger) error {
 	// native logger
 	nativeEncoderConfig := zap.NewDevelopmentEncoderConfig()
 	nativeEncoderConfig.LevelKey = ""
@@ -63,7 +63,7 @@ func setupLogger(logLevel, datastorePath string, mlogger NativeLogger) error {
 		RingSize:        10 * 1024 * 1024,
 		LogLevel:        logLevel,
 		LogNamespaces:   "*",
-		LogDirectory:    path.Join(datastorePath, "logs"),
+		LogDirectory:    path.Join(DeviceInfo.GetStoragePath(), "logs"),
 		AdditionalCores: []zapcore.Core{nativeCore},
 	})
 	if err != nil {

diff --git a/client/react-native/ios/modules/core/CoreModule.swift b/client/react-native/ios/modules/core/CoreModule.swift
@@ -20,7 +20,7 @@ var logger = Logger("chat.berty.io", "CoreModule")
 class CoreModule: NSObject {
   let connectivity = ConnectivityUpdateHandler()
   let serialCoreQueue = DispatchQueue(label: "BertyCore")
-  let daemon = CoreNewNativeBridge()
+  let daemon = CoreNewNativeBridge(logger)
 
   @objc func invoke(_ method: NSString, message: NSString, resolve: RCTPromiseResolveBlock!, reject: RCTPromiseRejectBlock!) {
     self.serialCoreQueue.sync {