chore: fix log (#4740)

* chore: fix log * chore: fix log * chore: bump client api
AppFlowy-IO · Feb 26, 2024 · 8d50ad2 · 8d50ad2
1 parent daedf95
commit 8d50ad2
Show file tree

Hide file tree

Showing 22 changed files with 272 additions and 197 deletions.
diff --git a/frontend/appflowy_flutter/android/app/src/main/Classes/binding.h b/frontend/appflowy_flutter/android/app/src/main/Classes/binding.h
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
 
 void link_me_please(void);
 
-void backend_log(int64_t level, const char *data);
+void rust_log(int64_t level, const char *data);
 
 void set_env(const char *data);
diff --git a/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart b/frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart
@@ -5,6 +5,7 @@ import 'package:appflowy/env/backend_env.dart';
 import 'package:appflowy/env/cloud_env.dart';
 import 'package:appflowy/user/application/auth/device_id.dart';
 import 'package:appflowy_backend/appflowy_backend.dart';
+import 'package:appflowy_backend/log.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as path;
 
@@ -38,6 +39,7 @@ class InitRustSDKTask extends LaunchTask {
       rustEnvs: context.config.rustEnvs,
     );
     await context.getIt<FlowySDK>().init(jsonEncode(env.toJson()));
+    Log.info('Rust SDK initialized');
   }
 
   @override

diff --git a/frontend/appflowy_flutter/linux/flutter/dart_ffi/binding.h b/frontend/appflowy_flutter/linux/flutter/dart_ffi/binding.h
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
 
 void link_me_please(void);
 
-void backend_log(int64_t level, const char *data);
+void rust_log(int64_t level, const char *data);
 
 void set_env(const char *data);
diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/binding.h b/frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/binding.h
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
 
 void link_me_please(void);
 
-void backend_log(int64_t level, const char *data);
+void rust_log(int64_t level, const char *data);
 
 void set_env(const char *data);
diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dart
@@ -137,20 +137,20 @@ typedef _store_dart_post_cobject_Dart = void Function(
   Pointer<NativeFunction<Int8 Function(Int64, Pointer<Dart_CObject>)>> ptr,
 );
 
-void log(
+void rust_log(
   int level,
   Pointer<ffi.Utf8> data,
 ) {
-  _invoke_log(level, data);
+  _invoke_rust_log(level, data);
 }
 
-final _invoke_log_Dart _invoke_log = _dart_ffi_lib
-    .lookupFunction<_invoke_log_C, _invoke_log_Dart>('backend_log');
-typedef _invoke_log_C = Void Function(
+final _invoke_rust_log_Dart _invoke_rust_log = _dart_ffi_lib
+    .lookupFunction<_invoke_rust_log_C, _invoke_rust_log_Dart>('rust_log');
+typedef _invoke_rust_log_C = Void Function(
   Int64 level,
   Pointer<ffi.Utf8> data,
 );
-typedef _invoke_log_Dart = void Function(
+typedef _invoke_rust_log_Dart = void Function(
   int level,
   Pointer<ffi.Utf8>,
 );

diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/lib/log.dart b/frontend/appflowy_flutter/packages/appflowy_backend/lib/log.dart
@@ -9,6 +9,7 @@ import 'ffi.dart';
 
 class Log {
   static final shared = Log();
+  // ignore: unused_field
   late Logger _logger;
 
   Log() {
@@ -26,63 +27,23 @@ class Log {
   }
 
   static void info(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
-    if (isReleaseVersion()) {
-      log(0, toNativeUtf8(msg));
-    } else {
-      Log.shared._logger.i(
-        msg,
-        error: error,
-        stackTrace: stackTrace,
-      );
-    }
+    rust_log(0, toNativeUtf8(msg));
   }
 
   static void debug(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
-    if (isReleaseVersion()) {
-      log(1, toNativeUtf8(msg));
-    } else {
-      Log.shared._logger.d(
-        msg,
-        error: error,
-        stackTrace: stackTrace,
-      );
-    }
+    rust_log(1, toNativeUtf8(msg));
   }
 
   static void warn(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
-    if (isReleaseVersion()) {
-      log(3, toNativeUtf8(msg));
-    } else {
-      Log.shared._logger.w(
-        msg,
-        error: error,
-        stackTrace: stackTrace,
-      );
-    }
+    rust_log(3, toNativeUtf8(msg));
   }
 
   static void trace(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
-    if (isReleaseVersion()) {
-      log(2, toNativeUtf8(msg));
-    } else {
-      Log.shared._logger.t(
-        msg,
-        error: error,
-        stackTrace: stackTrace,
-      );
-    }
+    rust_log(2, toNativeUtf8(msg));
   }
 
   static void error(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
-    if (isReleaseVersion()) {
-      log(4, toNativeUtf8(msg));
-    } else {
-      Log.shared._logger.e(
-        msg,
-        error: error,
-        stackTrace: stackTrace,
-      );
-    }
+    rust_log(4, toNativeUtf8(msg));
   }
 }
 

diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/linux/Classes/binding.h b/frontend/appflowy_flutter/packages/appflowy_backend/linux/Classes/binding.h
@@ -14,6 +14,6 @@ int32_t set_stream_port(int64_t port);
 
 void link_me_please(void);
 
-void backend_log(int64_t level, const char *data);
+void rust_log(int64_t level, const char *data);
 
 void set_env(const char *data);
diff --git a/frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/binding.h b/frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/binding.h
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
 
 void link_me_please(void);
 
-void backend_log(int64_t level, const char *data);
+void rust_log(int64_t level, const char *data);
 
 void set_env(const char *data);