Skip to content

Commit 8d50ad2

Browse files
authored
chore: fix log (#4740)
* chore: fix log * chore: fix log * chore: bump client api
1 parent daedf95 commit 8d50ad2

File tree

22 files changed

+272
-197
lines changed

22 files changed

+272
-197
lines changed

frontend/appflowy_flutter/android/app/src/main/Classes/binding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
1313

1414
void link_me_please(void);
1515

16-
void backend_log(int64_t level, const char *data);
16+
void rust_log(int64_t level, const char *data);
1717

1818
void set_env(const char *data);

frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:appflowy/env/backend_env.dart';
55
import 'package:appflowy/env/cloud_env.dart';
66
import 'package:appflowy/user/application/auth/device_id.dart';
77
import 'package:appflowy_backend/appflowy_backend.dart';
8+
import 'package:appflowy_backend/log.dart';
89
import 'package:path_provider/path_provider.dart';
910
import 'package:path/path.dart' as path;
1011

@@ -38,6 +39,7 @@ class InitRustSDKTask extends LaunchTask {
3839
rustEnvs: context.config.rustEnvs,
3940
);
4041
await context.getIt<FlowySDK>().init(jsonEncode(env.toJson()));
42+
Log.info('Rust SDK initialized');
4143
}
4244

4345
@override

frontend/appflowy_flutter/linux/flutter/dart_ffi/binding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
1313

1414
void link_me_please(void);
1515

16-
void backend_log(int64_t level, const char *data);
16+
void rust_log(int64_t level, const char *data);
1717

1818
void set_env(const char *data);

frontend/appflowy_flutter/packages/appflowy_backend/ios/Classes/binding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
1313

1414
void link_me_please(void);
1515

16-
void backend_log(int64_t level, const char *data);
16+
void rust_log(int64_t level, const char *data);
1717

1818
void set_env(const char *data);

frontend/appflowy_flutter/packages/appflowy_backend/lib/ffi.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,20 +137,20 @@ typedef _store_dart_post_cobject_Dart = void Function(
137137
Pointer<NativeFunction<Int8 Function(Int64, Pointer<Dart_CObject>)>> ptr,
138138
);
139139

140-
void log(
140+
void rust_log(
141141
int level,
142142
Pointer<ffi.Utf8> data,
143143
) {
144-
_invoke_log(level, data);
144+
_invoke_rust_log(level, data);
145145
}
146146

147-
final _invoke_log_Dart _invoke_log = _dart_ffi_lib
148-
.lookupFunction<_invoke_log_C, _invoke_log_Dart>('backend_log');
149-
typedef _invoke_log_C = Void Function(
147+
final _invoke_rust_log_Dart _invoke_rust_log = _dart_ffi_lib
148+
.lookupFunction<_invoke_rust_log_C, _invoke_rust_log_Dart>('rust_log');
149+
typedef _invoke_rust_log_C = Void Function(
150150
Int64 level,
151151
Pointer<ffi.Utf8> data,
152152
);
153-
typedef _invoke_log_Dart = void Function(
153+
typedef _invoke_rust_log_Dart = void Function(
154154
int level,
155155
Pointer<ffi.Utf8>,
156156
);

frontend/appflowy_flutter/packages/appflowy_backend/lib/log.dart

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import 'ffi.dart';
99

1010
class Log {
1111
static final shared = Log();
12+
// ignore: unused_field
1213
late Logger _logger;
1314

1415
Log() {
@@ -26,63 +27,23 @@ class Log {
2627
}
2728

2829
static void info(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
29-
if (isReleaseVersion()) {
30-
log(0, toNativeUtf8(msg));
31-
} else {
32-
Log.shared._logger.i(
33-
msg,
34-
error: error,
35-
stackTrace: stackTrace,
36-
);
37-
}
30+
rust_log(0, toNativeUtf8(msg));
3831
}
3932

4033
static void debug(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
41-
if (isReleaseVersion()) {
42-
log(1, toNativeUtf8(msg));
43-
} else {
44-
Log.shared._logger.d(
45-
msg,
46-
error: error,
47-
stackTrace: stackTrace,
48-
);
49-
}
34+
rust_log(1, toNativeUtf8(msg));
5035
}
5136

5237
static void warn(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
53-
if (isReleaseVersion()) {
54-
log(3, toNativeUtf8(msg));
55-
} else {
56-
Log.shared._logger.w(
57-
msg,
58-
error: error,
59-
stackTrace: stackTrace,
60-
);
61-
}
38+
rust_log(3, toNativeUtf8(msg));
6239
}
6340

6441
static void trace(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
65-
if (isReleaseVersion()) {
66-
log(2, toNativeUtf8(msg));
67-
} else {
68-
Log.shared._logger.t(
69-
msg,
70-
error: error,
71-
stackTrace: stackTrace,
72-
);
73-
}
42+
rust_log(2, toNativeUtf8(msg));
7443
}
7544

7645
static void error(dynamic msg, [dynamic error, StackTrace? stackTrace]) {
77-
if (isReleaseVersion()) {
78-
log(4, toNativeUtf8(msg));
79-
} else {
80-
Log.shared._logger.e(
81-
msg,
82-
error: error,
83-
stackTrace: stackTrace,
84-
);
85-
}
46+
rust_log(4, toNativeUtf8(msg));
8647
}
8748
}
8849

frontend/appflowy_flutter/packages/appflowy_backend/linux/Classes/binding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ int32_t set_stream_port(int64_t port);
1414

1515
void link_me_please(void);
1616

17-
void backend_log(int64_t level, const char *data);
17+
void rust_log(int64_t level, const char *data);
1818

1919
void set_env(const char *data);

frontend/appflowy_flutter/packages/appflowy_backend/macos/Classes/binding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ int32_t set_stream_port(int64_t port);
1313

1414
void link_me_please(void);
1515

16-
void backend_log(int64_t level, const char *data);
16+
void rust_log(int64_t level, const char *data);
1717

1818
void set_env(const char *data);

0 commit comments

Comments
 (0)