From 0ba0bb62ce02bcf488c582a6e3dc2a4938b0382c Mon Sep 17 00:00:00 2001 From: appflowy Date: Sat, 9 Apr 2022 11:55:00 +0800 Subject: [PATCH] chore: config flowy-sync crate log level --- frontend/rust-lib/Cargo.lock | 1 + frontend/rust-lib/flowy-sdk/src/lib.rs | 3 +-- shared-lib/Cargo.lock | 1 + shared-lib/flowy-grid-data-model/Cargo.toml | 1 + .../flowy-grid-data-model/src/entities/meta.rs | 13 ++++++++++++- .../src/client_grid/grid_block_meta_pad.rs | 1 + 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index 1a996b2a43..a21105a163 100755 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -975,6 +975,7 @@ dependencies = [ "protobuf", "serde", "serde_json", + "serde_repr", "strum", "strum_macros", "uuid", diff --git a/frontend/rust-lib/flowy-sdk/src/lib.rs b/frontend/rust-lib/flowy-sdk/src/lib.rs index 8ade107e00..6ae356346c 100644 --- a/frontend/rust-lib/flowy-sdk/src/lib.rs +++ b/frontend/rust-lib/flowy-sdk/src/lib.rs @@ -74,12 +74,11 @@ fn crate_log_filter(level: String) -> String { filters.push(format!("lib_ot={}", level)); filters.push(format!("lib_ws={}", level)); filters.push(format!("lib_infra={}", level)); + filters.push(format!("flowy_sync={}", level)); filters.push(format!("dart_ffi={}", "info")); filters.push(format!("flowy_database={}", "info")); filters.push(format!("flowy_net={}", "info")); - filters.push(format!("flowy_sync={}", "info")); - filters.join(",") } diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock index db2a3d9ad7..52cb6d081f 100644 --- a/shared-lib/Cargo.lock +++ b/shared-lib/Cargo.lock @@ -462,6 +462,7 @@ dependencies = [ "protobuf", "serde", "serde_json", + "serde_repr", "strum", "strum_macros", "uuid", diff --git a/shared-lib/flowy-grid-data-model/Cargo.toml b/shared-lib/flowy-grid-data-model/Cargo.toml index 89461b444c..e5a78e41ca 100644 --- a/shared-lib/flowy-grid-data-model/Cargo.toml +++ b/shared-lib/flowy-grid-data-model/Cargo.toml @@ -13,6 +13,7 @@ strum = "0.21" strum_macros = "0.21" serde = { version = "1.0", features = ["derive"] } serde_json = {version = "1.0"} +serde_repr = "0.1" uuid = { version = "0.8", features = ["serde", "v4"] } flowy-error-code = { path = "../flowy-error-code"} diff --git a/shared-lib/flowy-grid-data-model/src/entities/meta.rs b/shared-lib/flowy-grid-data-model/src/entities/meta.rs index a170e9c4d4..2178a49f24 100644 --- a/shared-lib/flowy-grid-data-model/src/entities/meta.rs +++ b/shared-lib/flowy-grid-data-model/src/entities/meta.rs @@ -3,6 +3,7 @@ use bytes::Bytes; use flowy_derive::{ProtoBuf, ProtoBuf_Enum}; use flowy_error_code::ErrorCode; use serde::{Deserialize, Serialize}; +use serde_repr::*; use std::collections::HashMap; use strum_macros::{Display, EnumCount as EnumCountMacro, EnumIter, EnumString}; @@ -224,7 +225,17 @@ impl TryInto for FieldChangesetPayload { } #[derive( - Debug, Clone, PartialEq, Eq, ProtoBuf_Enum, EnumCountMacro, EnumString, EnumIter, Display, Serialize, Deserialize, + Debug, + Clone, + PartialEq, + Eq, + ProtoBuf_Enum, + EnumCountMacro, + EnumString, + EnumIter, + Display, + Serialize_repr, + Deserialize_repr, )] #[repr(u8)] pub enum FieldType { diff --git a/shared-lib/flowy-sync/src/client_grid/grid_block_meta_pad.rs b/shared-lib/flowy-sync/src/client_grid/grid_block_meta_pad.rs index 2d70309fef..1ac65214da 100644 --- a/shared-lib/flowy-sync/src/client_grid/grid_block_meta_pad.rs +++ b/shared-lib/flowy-sync/src/client_grid/grid_block_meta_pad.rs @@ -156,6 +156,7 @@ impl GridBlockMetaPad { match cal_diff::(old, new) { None => Ok(None), Some(delta) => { + tracing::trace!("[GridBlockMeta] Composing change {}", delta.to_delta_str()); self.delta = self.delta.compose(&delta)?; Ok(Some(GridBlockMetaChange { delta, md5: self.md5() })) }