From 8ec02f710cf77fe88e6acd3b59ddf270e5c503e9 Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 27 May 2025 13:57:00 +0800 Subject: [PATCH] feat: add --log-to-stdout for command Signed-off-by: Gaius --- ci/Dockerfile | 2 +- ci/Dockerfile.debug | 2 +- ci/Dockerfile.dfinit | 2 +- ci/dfdaemon.service | 2 +- docs/performance-optimization.md | 2 +- dragonfly-client-backend/examples/plugin/README.md | 2 +- dragonfly-client-init/src/bin/main.rs | 10 +++------- dragonfly-client/src/bin/dfcache/export.rs | 10 +++------- dragonfly-client/src/bin/dfcache/import.rs | 10 +++------- dragonfly-client/src/bin/dfcache/stat.rs | 10 +++------- dragonfly-client/src/bin/dfdaemon/main.rs | 10 +++------- dragonfly-client/src/bin/dfget/main.rs | 10 +++------- dragonfly-client/src/tracing/mod.rs | 4 ++-- 13 files changed, 26 insertions(+), 50 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 162d77f4..36379ced 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -34,7 +34,7 @@ COPY dragonfly-client-util/src ./dragonfly-client-util/src COPY dragonfly-client-init/Cargo.toml ./dragonfly-client-init/Cargo.toml COPY dragonfly-client-init/src ./dragonfly-client-init/src -RUN cargo build --release --verbose --bin dfget --bin dfdaemon --bin dfcache +RUN cargo build --release --log-to-stdout --bin dfget --bin dfdaemon --bin dfcache FROM public.ecr.aws/docker/library/alpine:3.20 AS health diff --git a/ci/Dockerfile.debug b/ci/Dockerfile.debug index af868004..f65506df 100644 --- a/ci/Dockerfile.debug +++ b/ci/Dockerfile.debug @@ -34,7 +34,7 @@ COPY dragonfly-client-util/src ./dragonfly-client-util/src COPY dragonfly-client-init/Cargo.toml ./dragonfly-client-init/Cargo.toml COPY dragonfly-client-init/src ./dragonfly-client-init/src -RUN cargo build --verbose --bin dfget --bin dfdaemon --bin dfcache +RUN cargo build --log-to-stdout --bin dfget --bin dfdaemon --bin dfcache RUN cargo install flamegraph --root /usr/local RUN cargo install bottom --locked --root /usr/local diff --git a/ci/Dockerfile.dfinit b/ci/Dockerfile.dfinit index c84c793a..65575636 100644 --- a/ci/Dockerfile.dfinit +++ b/ci/Dockerfile.dfinit @@ -34,7 +34,7 @@ COPY dragonfly-client-util/src ./dragonfly-client-util/src COPY dragonfly-client-init/Cargo.toml ./dragonfly-client-init/Cargo.toml COPY dragonfly-client-init/src ./dragonfly-client-init/src -RUN cargo build --release --verbose --bin dfinit +RUN cargo build --release --log-to-stdout --bin dfinit FROM public.ecr.aws/debian/debian:bookworm-slim diff --git a/ci/dfdaemon.service b/ci/dfdaemon.service index 6d2ccd92..acd14eea 100644 --- a/ci/dfdaemon.service +++ b/ci/dfdaemon.service @@ -5,7 +5,7 @@ After=network-online.target After=network.target [Service] -ExecStart=/usr/bin/dfdaemon --config /etc/dragonfly/dfdaemon.yaml --verbose +ExecStart=/usr/bin/dfdaemon --config /etc/dragonfly/dfdaemon.yaml --log-to-stdout Type=simple Environment=HOME=/root diff --git a/docs/performance-optimization.md b/docs/performance-optimization.md index 2205d1c1..66797d81 100644 --- a/docs/performance-optimization.md +++ b/docs/performance-optimization.md @@ -69,7 +69,7 @@ cargo build --release --bin dfdaemon ```bash # prepare client.yaml by yourself. -./target/release/dfdaemon --config client.yaml -l info --verbose +./target/release/dfdaemon --config client.yaml -l info --log-to-stdout ``` ## FlameGraph diff --git a/dragonfly-client-backend/examples/plugin/README.md b/dragonfly-client-backend/examples/plugin/README.md index ae93e43a..35e10408 100644 --- a/dragonfly-client-backend/examples/plugin/README.md +++ b/dragonfly-client-backend/examples/plugin/README.md @@ -14,7 +14,7 @@ cargo build --all && mv target/debug/libhdfs.so {plugin_dir}/backend/libhdfs.so ## Run Client with Plugin ```shell -$ cargo run --bin dfdaemon -- --config {config_dir}/config.yaml -l info --verbose +$ cargo run --bin dfdaemon -- --config {config_dir}/config.yaml -l info --log-to-stdout INFO load [http] builtin backend INFO load [https] builtin backend INFO load [hdfs] plugin backend diff --git a/dragonfly-client-init/src/bin/main.rs b/dragonfly-client-init/src/bin/main.rs index b69b5ffa..a613fe3d 100644 --- a/dragonfly-client-init/src/bin/main.rs +++ b/dragonfly-client-init/src/bin/main.rs @@ -64,12 +64,8 @@ struct Args { )] log_max_files: usize, - #[arg( - long = "verbose", - default_value_t = false, - help = "Specify whether to print log" - )] - verbose: bool, + #[arg(long, default_value_t = false, help = "Specify whether to print log")] + log_to_stdout: bool, #[arg( short = 'V', @@ -95,7 +91,7 @@ async fn main() -> Result<(), anyhow::Error> { args.log_max_files, None, None, - args.verbose, + args.log_to_stdout, ); // Load config. diff --git a/dragonfly-client/src/bin/dfcache/export.rs b/dragonfly-client/src/bin/dfcache/export.rs index c0aa5719..b65e5e6c 100644 --- a/dragonfly-client/src/bin/dfcache/export.rs +++ b/dragonfly-client/src/bin/dfcache/export.rs @@ -115,12 +115,8 @@ pub struct ExportCommand { )] log_max_files: usize, - #[arg( - long = "verbose", - default_value_t = false, - help = "Specify whether to print log" - )] - verbose: bool, + #[arg(long, default_value_t = false, help = "Specify whether to print log")] + log_to_stdout: bool, } /// Implement the execute for ExportCommand. @@ -138,7 +134,7 @@ impl ExportCommand { self.log_max_files, None, None, - self.verbose, + self.log_to_stdout, ); // Validate the command line arguments. diff --git a/dragonfly-client/src/bin/dfcache/import.rs b/dragonfly-client/src/bin/dfcache/import.rs index 11290e43..13a51b9a 100644 --- a/dragonfly-client/src/bin/dfcache/import.rs +++ b/dragonfly-client/src/bin/dfcache/import.rs @@ -121,12 +121,8 @@ pub struct ImportCommand { )] log_max_files: usize, - #[arg( - long = "verbose", - default_value_t = false, - help = "Specify whether to print log" - )] - verbose: bool, + #[arg(long, default_value_t = false, help = "Specify whether to print log")] + log_to_stdout: bool, } /// Implement the execute for ImportCommand. @@ -144,7 +140,7 @@ impl ImportCommand { self.log_max_files, None, None, - self.verbose, + self.log_to_stdout, ); // Validate the command line arguments. diff --git a/dragonfly-client/src/bin/dfcache/stat.rs b/dragonfly-client/src/bin/dfcache/stat.rs index 4bbc2968..058d5c42 100644 --- a/dragonfly-client/src/bin/dfcache/stat.rs +++ b/dragonfly-client/src/bin/dfcache/stat.rs @@ -67,12 +67,8 @@ pub struct StatCommand { )] log_max_files: usize, - #[arg( - long = "verbose", - default_value_t = false, - help = "Specify whether to print log" - )] - verbose: bool, + #[arg(long, default_value_t = false, help = "Specify whether to print log")] + log_to_stdout: bool, } /// Implement the execute for StatCommand. @@ -90,7 +86,7 @@ impl StatCommand { self.log_max_files, None, None, - self.verbose, + self.log_to_stdout, ); // Get dfdaemon download client. diff --git a/dragonfly-client/src/bin/dfdaemon/main.rs b/dragonfly-client/src/bin/dfdaemon/main.rs index 085e73d1..15a84125 100644 --- a/dragonfly-client/src/bin/dfdaemon/main.rs +++ b/dragonfly-client/src/bin/dfdaemon/main.rs @@ -91,12 +91,8 @@ struct Args { )] log_max_files: usize, - #[arg( - long = "verbose", - default_value_t = true, - help = "Specify whether to print log" - )] - verbose: bool, + #[arg(long, default_value_t = true, help = "Specify whether to print log")] + log_to_stdout: bool, #[arg( short = 'V', @@ -151,7 +147,7 @@ async fn main() -> Result<(), anyhow::Error> { args.log_max_files, config.tracing.addr.to_owned(), Some(config.host.clone()), - args.verbose, + args.log_to_stdout, ); // Initialize storage. diff --git a/dragonfly-client/src/bin/dfget/main.rs b/dragonfly-client/src/bin/dfget/main.rs index dfb2d073..ab037ef0 100644 --- a/dragonfly-client/src/bin/dfget/main.rs +++ b/dragonfly-client/src/bin/dfget/main.rs @@ -278,12 +278,8 @@ struct Args { )] log_max_files: usize, - #[arg( - long = "verbose", - default_value_t = false, - help = "Specify whether to print log" - )] - verbose: bool, + #[arg(long, default_value_t = false, help = "Specify whether to print log")] + log_to_stdout: bool, #[arg( short = 'V', @@ -309,7 +305,7 @@ async fn main() -> anyhow::Result<()> { args.log_max_files, None, None, - args.verbose, + args.log_to_stdout, ); // Validate command line arguments. diff --git a/dragonfly-client/src/tracing/mod.rs b/dragonfly-client/src/tracing/mod.rs index de003749..7e64665e 100644 --- a/dragonfly-client/src/tracing/mod.rs +++ b/dragonfly-client/src/tracing/mod.rs @@ -44,7 +44,7 @@ pub fn init_tracing( log_max_files: usize, jaeger_addr: Option, host: Option, - verbose: bool, + log_to_stdout: bool, ) -> Vec { let mut guards = vec![]; @@ -53,7 +53,7 @@ pub fn init_tracing( guards.push(stdout_guard); // Initialize stdout layer. - let stdout_filter = if verbose { + let stdout_filter = if log_to_stdout { LevelFilter::DEBUG } else { LevelFilter::OFF