Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix slog and slog-global #375

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Fix slog and slog-global #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
164aaae
fix
CalvinNeo Jun 19, 2024
afd82ef
ul
CalvinNeo Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 46 additions & 57 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions proxy_components/engine_store_ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ rand = "0.8.3"
serde = "1.0"
serde_derive = "1.0"
serde_with = "1.4"
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
smallvec = "1.4"
sst_importer = { workspace = true, default-features = false }
tempfile = "3.0"
Expand Down
4 changes: 2 additions & 2 deletions proxy_components/engine_tiflash/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ raft = { version = "0.7.0", default-features = false, features = ["protobuf-code
regex = "1"
serde = "1.0"
serde_derive = "1.0"
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
slog_derive = "0.2"
tempfile = "3.0"
tikv_alloc = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions proxy_components/mock-engine-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ serde_json = "1.0"
service = { workspace = true }
security = { workspace = true, default-features = false }
server = { workspace = true }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
tempfile = "3.0"
test_pd_client = { workspace = true }
test_raftstore = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions proxy_components/proxy_ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ protobuf = { version = "2.8", features = ["bytes"] }
pd_client = { workspace = true }
raftstore = { workspace = true, default-features = false }
serde_json = "1.0"
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
tikv_util = { workspace = true, default-features = false }
tokio = { version = "1.5", features = ["sync", "rt-multi-thread"] }
tokio-timer = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }
Expand Down
4 changes: 2 additions & 2 deletions proxy_components/proxy_server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ serde_ignored = "0.1"
serde_json = "1.0"
serde_with = "1.4"
server = { workspace = true, default-features = false }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
tempfile = "3.0"
tikv = { workspace = true, default-features = false }
tikv_alloc = { workspace = true }
Expand Down
5 changes: 2 additions & 3 deletions proxy_components/proxy_test_raftstore_v2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ resource_control = { workspace = true }
resource_metering = { workspace = true }
security = { workspace = true }
server = { workspace = true }
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
# better to not use slog-global, but pass in the logger
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
tempfile = "3.0"
test_pd_client = { workspace = true }
test_raftstore = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions proxy_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ raftstore-v2 = { workspace = true }
rand = "0.8.3"
serde = "1.0"
serde_derive = "1.0"
slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
slog = { workspace = true }
slog-global = { workspace = true }
tempfile = "3.0"
tidb_query_aggr = { workspace = true }
tidb_query_common = { workspace = true }
Expand Down
Loading