Radish alpha
r
radicle-ci-broker
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
refactor: use env_logger instead of pretty_env_logger
Lars Wirzenius committed 1 year ago
commit a3953e4b953391a3b1df8dabc6d487a1dac51831
parent b7e71f380bfc26f1cd0c9d6f8d049e3010461b14
5 files changed +3 -15
modified Cargo.lock
@@ -1540,16 +1540,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"



[[package]]
- 
name = "pretty_env_logger"
- 
version = "0.5.0"
- 
source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
- 
dependencies = [
- 
 "env_logger 0.10.2",
- 
 "log",
- 
]
-
- 
[[package]]

name = "primeorder"

version = "0.13.6"

source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1663,7 +1653,6 @@ dependencies = [
 "fehler",

 "html-page",

 "log",
- 
 "pretty_env_logger",

 "radicle",

 "radicle-git-ext",

 "radicle-surf",
modified Cargo.toml
@@ -15,7 +15,6 @@ anyhow = "1.0.82"
clap = { version = "4.5.4", features = ["derive", "wrap_help"] }

html-page = "0.2.0"

log = "0.4.20"
- 
pretty_env_logger = "0.5.0"

radicle-git-ext = "0.7.0"

radicle-surf = { version = "0.18.0", default-features = false, features = ["serde"] }

serde = { version = "1.0.193", features = ["derive"] }
modified src/bin/cib.rs
@@ -39,7 +39,7 @@ fn main() {
fn fallible_main() -> Result<(), CibError> {

    let args = Args::parse();
- 
    pretty_env_logger::init_custom_env("RADICLE_CI_BROKER_LOG");
+ 
    env_logger::init_from_env("RADICLE_CI_BROKER_LOG");

    info!("Radicle CI broker starts");



    let config = Config::load(&args.config).map_err(|e| CibError::read_config(&args.config, e))?;
modified src/bin/cibtool.rs
@@ -48,7 +48,7 @@ fn main() {


#[allow(clippy::result_large_err)]

fn fallible_main() -> Result<(), CibToolError> {
- 
    pretty_env_logger::init();
+ 
    env_logger::init_from_env("RADICLE_CI_BROKER_LOG");



    let args = Args::parse();

    args.run()?;
modified src/test.rs
@@ -92,7 +92,7 @@ pub fn mock_adapter(filename: &Path, script: &str) -> TestResult<Adapter> {
}



pub fn log_in_tests() {
- 
    pretty_env_logger::formatted_builder()
+ 
    env_logger::builder()

        .filter_level(log::LevelFilter::Debug)

        .is_test(true)

        .try_init()