diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-01 11:11:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-01 11:11:14 +0000 |
commit | 2730678378363102d5e1de77eb3f3f94a8e3eb0c (patch) | |
tree | 9ec164a07b22afbcbf16b4732bbba44c44417358 | |
parent | 53d2763a23872f63657d01b3d6df9777245e4d3c (diff) | |
parent | 940820cfa14a1aa7b88cd9f24569833d8cc780aa (diff) | |
download | security-2730678378363102d5e1de77eb3f3f94a8e3eb0c.tar.gz |
Merge "Replace use of deprecated logging functions" into main
-rw-r--r-- | keystore2/src/keystore2_main.rs | 4 | ||||
-rw-r--r-- | prng_seeder/src/main.rs | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/keystore2/src/keystore2_main.rs b/keystore2/src/keystore2_main.rs index 059d59d0..178b36c7 100644 --- a/keystore2/src/keystore2_main.rs +++ b/keystore2/src/keystore2_main.rs @@ -40,8 +40,8 @@ fn main() { android_logger::init_once( android_logger::Config::default() .with_tag("keystore2") - .with_min_level(log::Level::Debug) - .with_log_id(android_logger::LogId::System) + .with_max_level(log::LevelFilter::Debug) + .with_log_buffer(android_logger::LogId::System) .format(|buf, record| { writeln!( buf, diff --git a/prng_seeder/src/main.rs b/prng_seeder/src/main.rs index f8b0c63d..cb7f38d7 100644 --- a/prng_seeder/src/main.rs +++ b/prng_seeder/src/main.rs @@ -31,7 +31,7 @@ use std::{ use anyhow::{ensure, Context, Result}; use clap::Parser; -use log::{error, info, Level}; +use log::{error, info, LevelFilter}; use nix::sys::signal; use tokio::{io::AsyncWriteExt, net::UnixListener as TokioUnixListener}; @@ -48,7 +48,9 @@ struct Cli { fn configure_logging() -> Result<()> { ensure!( logger::init( - logger::Config::default().with_tag_on_device("prng_seeder").with_min_level(Level::Info) + logger::Config::default() + .with_tag_on_device("prng_seeder") + .with_max_level(LevelFilter::Info) ), "log configuration failed" ); |