You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by ti...@apache.org on 2025/01/26 06:34:31 UTC
(opendal) 01/02: chore: try use logforth
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch use-logforth
in repository https://gitbox.apache.org/repos/asf/opendal.git
commit a02221cea5f4cdf04430a6d98f3b55f35eb61cd3
Author: tison <wa...@gmail.com>
AuthorDate: Sun Jan 26 14:12:20 2025 +0800
chore: try use logforth
Signed-off-by: tison <wa...@gmail.com>
---
bin/ofs/Cargo.lock | 77 ++++++++++++++++++------
bin/ofs/Cargo.toml | 8 +--
bin/ofs/src/main.rs | 2 +-
bin/ofs/tests/common/mod.rs | 2 +-
dev/Cargo.lock | 77 ++++++++++++++++++------
dev/Cargo.toml | 2 +-
dev/src/main.rs | 2 +-
integrations/cloud_filter/Cargo.toml | 4 +-
integrations/cloud_filter/examples/readonly.rs | 2 +-
integrations/cloud_filter/tests/behavior/main.rs | 2 +-
10 files changed, 126 insertions(+), 52 deletions(-)
diff --git a/bin/ofs/Cargo.lock b/bin/ofs/Cargo.lock
index 4d719088c..4d15f0c74 100644
--- a/bin/ofs/Cargo.lock
+++ b/bin/ofs/Cargo.lock
@@ -449,19 +449,6 @@ dependencies = [
"regex",
]
-[[package]]
-name = "env_logger"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
[[package]]
name = "errno"
version = "0.3.10"
@@ -751,12 +738,6 @@ version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
[[package]]
name = "hyper"
version = "1.5.2"
@@ -993,6 +974,35 @@ version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+[[package]]
+name = "jiff"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a85348106ab244d90fe2d70faad939b71c5dad1258e5da9116e176064fc6c078"
+dependencies = [
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf2cec2f5d266af45a071ece48b1fb89f3b00b2421ac3a5fe10285a6caaa60d3"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
+dependencies = [
+ "jiff-tzdb",
+]
+
[[package]]
name = "js-sys"
version = "0.3.76"
@@ -1033,6 +1043,18 @@ version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+[[package]]
+name = "logforth"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a891ee49bd03c4af719b4872b2279d68112d7fa764f10e5ec89cdb674324c41"
+dependencies = [
+ "anyhow",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
[[package]]
name = "md-5"
version = "0.10.6"
@@ -1139,11 +1161,11 @@ dependencies = [
"clap",
"cloud-filter",
"cloud_filter_opendal",
- "env_logger",
"fuse3",
"fuse3_opendal",
"libc",
"log",
+ "logforth",
"nix",
"opendal",
"tempfile",
@@ -1223,6 +1245,21 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
[[package]]
name = "powerfmt"
version = "0.2.0"
diff --git a/bin/ofs/Cargo.toml b/bin/ofs/Cargo.toml
index c3dd99b85..4ca7924a5 100644
--- a/bin/ofs/Cargo.toml
+++ b/bin/ofs/Cargo.toml
@@ -30,10 +30,10 @@ repository = "https://github.com/apache/opendal"
rust-version = "1.75"
[dependencies]
-anyhow = "1"
+anyhow = { version = "1" }
clap = { version = "4.5.21", features = ["derive", "env"] }
-env_logger = "0.11.2"
-log = "0.4.21"
+log = { version = "0.4.22" }
+logforth = { version = "0.21.0", default-features = false }
opendal = { version = "0.51.0", path = "../../core" }
tokio = { version = "1.37.0", features = [
"fs",
@@ -42,7 +42,7 @@ tokio = { version = "1.37.0", features = [
"io-std",
"signal",
] }
-url = "2.5.0"
+url = { version = "2.5.4" }
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
fuse3 = { version = "0.8.1", "features" = ["tokio-runtime", "unprivileged"] }
diff --git a/bin/ofs/src/main.rs b/bin/ofs/src/main.rs
index ce0b563fe..9555fc225 100644
--- a/bin/ofs/src/main.rs
+++ b/bin/ofs/src/main.rs
@@ -38,7 +38,7 @@ struct Config {
async fn main() -> Result<()> {
let cfg = Config::parse();
- env_logger::init();
+ logforth::stderr().apply();
execute(cfg).await
}
diff --git a/bin/ofs/tests/common/mod.rs b/bin/ofs/tests/common/mod.rs
index 2fbfcc10f..a12c8a983 100644
--- a/bin/ofs/tests/common/mod.rs
+++ b/bin/ofs/tests/common/mod.rs
@@ -44,7 +44,7 @@ impl TestContext for OfsTestContext {
.expect("no test services has been configured");
let capability = backend.info().full_capability();
- INIT_LOGGER.get_or_init(env_logger::init);
+ INIT_LOGGER.get_or_init(|| logforth::stderr().apply());
let mount_point = tempfile::tempdir().unwrap();
let mount_point_str = mount_point.path().to_string_lossy().to_string();
diff --git a/dev/Cargo.lock b/dev/Cargo.lock
index 350142ba8..71a8d12cb 100644
--- a/dev/Cargo.lock
+++ b/dev/Cargo.lock
@@ -128,43 +128,65 @@ dependencies = [
"regex",
]
-[[package]]
-name = "env_logger"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+[[package]]
+name = "jiff"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a85348106ab244d90fe2d70faad939b71c5dad1258e5da9116e176064fc6c078"
+dependencies = [
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf2cec2f5d266af45a071ece48b1fb89f3b00b2421ac3a5fe10285a6caaa60d3"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
+dependencies = [
+ "jiff-tzdb",
+]
+
[[package]]
name = "log"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+[[package]]
+name = "logforth"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a891ee49bd03c4af719b4872b2279d68112d7fa764f10e5ec89cdb674324c41"
+dependencies = [
+ "anyhow",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
[[package]]
name = "markdown"
version = "1.0.0-alpha.21"
@@ -195,9 +217,9 @@ version = "0.0.1"
dependencies = [
"anyhow",
"clap",
- "env_logger",
"heck",
"log",
+ "logforth",
"markdown",
"minijinja",
"pretty_assertions",
@@ -205,6 +227,21 @@ dependencies = [
"syn",
]
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
[[package]]
name = "pretty_assertions"
version = "1.4.1"
diff --git a/dev/Cargo.toml b/dev/Cargo.toml
index 6c7c3026d..a1b478b37 100644
--- a/dev/Cargo.toml
+++ b/dev/Cargo.toml
@@ -30,8 +30,8 @@ version = "0.0.1"
[dependencies]
anyhow = { version = "1.0.95" }
clap = { version = "4.5.23", features = ["derive"] }
-env_logger = { version = "0.11.5" }
log = { version = "0.4.22" }
+logforth = { version = "0.21.0", default-features = false }
heck = { version = "0.5.0" }
markdown = { version = "1.0.0-alpha.21" }
minijinja = { version = "2.5.0" }
diff --git a/dev/src/main.rs b/dev/src/main.rs
index 1858e89b1..d80d11d80 100644
--- a/dev/src/main.rs
+++ b/dev/src/main.rs
@@ -48,7 +48,7 @@ enum Commands {
}
fn main() -> Result<()> {
- env_logger::init();
+ logforth::stderr().apply();
match Cmd::parse().command {
Commands::Generate { language } => generate::run(&language),
diff --git a/integrations/cloud_filter/Cargo.toml b/integrations/cloud_filter/Cargo.toml
index 504e18ed5..6a15011c9 100644
--- a/integrations/cloud_filter/Cargo.toml
+++ b/integrations/cloud_filter/Cargo.toml
@@ -39,8 +39,8 @@ opendal = { version = "0.51.0", path = "../../core" }
serde = { version = "1.0.203", features = ["derive"] }
[dev-dependencies]
-env_logger = "0.11.2"
-libtest-mimic = "0.7.3"
+libtest-mimic = { version = "0.8.1" }
+logforth = { version = "0.21.0", default-features = false }
opendal = { version = "0.51.0", path = "../../core", features = [
"services-fs",
"tests",
diff --git a/integrations/cloud_filter/examples/readonly.rs b/integrations/cloud_filter/examples/readonly.rs
index 56bcbc5d1..9e5956c3c 100644
--- a/integrations/cloud_filter/examples/readonly.rs
+++ b/integrations/cloud_filter/examples/readonly.rs
@@ -11,7 +11,7 @@ const DISPLAY_NAME: &str = "Read Only Cloud Filter";
#[tokio::main]
async fn main() {
- env_logger::init();
+ logforth::stderr().apply();
let root = env::var("ROOT").expect("$ROOT is set");
let client_path = env::var("CLIENT_PATH").expect("$CLIENT_PATH is set");
diff --git a/integrations/cloud_filter/tests/behavior/main.rs b/integrations/cloud_filter/tests/behavior/main.rs
index 8f73d9b26..771ffa01a 100644
--- a/integrations/cloud_filter/tests/behavior/main.rs
+++ b/integrations/cloud_filter/tests/behavior/main.rs
@@ -49,7 +49,7 @@ type Callback = Pin<Box<dyn Future<Output = ()>>>;
async fn main() -> ExitCode {
let args = Arguments::from_args();
- env_logger::init();
+ logforth::stderr().apply();
let Ok(Some(op)) = tests::init_test_service() else {
return ExitCode::SUCCESS;