tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace use of deprecated logging functions

Browse source 
This is needed to upgrade the android_logger crate from 0.12.0
to 0.13.3.

with_max_level provides the same functionality as with_min_level.
The renaming is admittedly confusing, but the new name is accurate
and it makes sense that they deprecated and then removed the
previously poorly named with_min_level.

See crate documentation [1] and code [2].

[1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level
[2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227

Bug: 322718401
Test: build and run CF with the change.
Test: m aosp_cf_x86_64_phone
Change-Id: I8d9d7c42100ede48496f9846068ed312fb8a15cb
This commit is contained in:
Jeff Vander Stoep 2024-01-31 10:55:29 +01:00
parent 3b862a87dd
commit 940820cfa1
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keystore2/src/keystore2_main.rs
View file

@ -40,8 +40,8 @@ fn main() {
android_logger::init_once( android_logger::init_once(
android_logger::Config::default() android_logger::Config::default()
.with_tag("keystore2") .with_tag("keystore2")
.with_min_level(log::Level::Debug) .with_max_level(log::LevelFilter::Debug)
.with_log_id(android_logger::LogId::System) .with_log_buffer(android_logger::LogId::System)
.format(|buf, record| { .format(|buf, record| {
writeln!( writeln!(
buf, buf,

6
prng_seeder/src/main.rs
View file

@ -31,7 +31,7 @@ use std::{
use anyhow::{ensure, Context, Result}; use anyhow::{ensure, Context, Result};
use clap::Parser; use clap::Parser;
use log::{error, info, Level}; use log::{error, info, LevelFilter};
use nix::sys::signal; use nix::sys::signal;
use tokio::{io::AsyncWriteExt, net::UnixListener as TokioUnixListener}; use tokio::{io::AsyncWriteExt, net::UnixListener as TokioUnixListener};
@ -48,7 +48,9 @@ struct Cli {
fn configure_logging() -> Result<()> { fn configure_logging() -> Result<()> {
ensure!( ensure!(
logger::init( 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" "log configuration failed"
); );