Skip to content

Commit

Permalink
Merge pull request #47 from dandi/gh-29
Browse files Browse the repository at this point in the history
Add `--log-level` option
  • Loading branch information
jwodder authored Nov 26, 2024
2 parents 6f2b3dd + 891a09c commit e15772e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ Options
- `-I <INT>`, `--inventory-jobs <INT>` — Specify the maximum number of inventory
list files to download & process at once [default: 20]

- `-l <level>`, `--log-level <level>` — Set the log level to the given value.
Possible values are "`ERROR`", "`WARN`", "`INFO`", "`DEBUG`", and "`TRACE`"
(all case-insensitive). [default value: `DEBUG`]

- `-O <INT>`, `--object-jobs <INT>` — Specify the maximum number of inventory
entries to download & process at once [default: 20]

Expand Down
22 changes: 15 additions & 7 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ struct Arguments {
#[arg(short = 'I', long, default_value = "20")]
inventory_jobs: NonZeroUsize,

/// Set logging level
#[arg(
short,
long,
default_value = "DEBUG",
value_name = "ERROR|WARN|INFO|DEBUG|TRACE"
)]
log_level: Level,

/// Set the maximum number of inventory entries to download & process at
/// once
#[arg(short = 'O', long, default_value = "20")]
Expand Down Expand Up @@ -65,6 +74,7 @@ struct Arguments {
// <https://docs.rs/tracing-subscriber/latest/tracing_subscriber/fmt/time/struct.OffsetTime.html#method.local_rfc_3339>
// for an explanation of the main + #[tokio::main]run thing
fn main() -> anyhow::Result<()> {
let args = Arguments::parse();
let timer =
OffsetTime::local_rfc_3339().context("failed to determine local timezone offset")?;
tracing_subscriber::registry()
Expand All @@ -76,18 +86,16 @@ fn main() -> anyhow::Result<()> {
)
.with(
Targets::new()
.with_target(env!("CARGO_CRATE_NAME"), Level::TRACE)
.with_target("aws_config", Level::DEBUG)
.with_target("reqwest", Level::TRACE)
.with_default(Level::INFO),
.with_target(env!("CARGO_CRATE_NAME"), args.log_level)
.with_target("aws_config", Level::DEBUG.min(args.log_level))
.with_default(Level::INFO.min(args.log_level)),
)
.init();
run()
run(args)
}

#[tokio::main]
async fn run() -> anyhow::Result<()> {
let args = Arguments::parse();
async fn run(args: Arguments) -> anyhow::Result<()> {
let bucket = args.inventory_base.bucket();
tracing::info!(%bucket, "Determining region for S3 bucket ...");
let region = get_bucket_region(args.inventory_base.bucket()).await?;
Expand Down

0 comments on commit e15772e

Please sign in to comment.