1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-11 13:51:01 -05:00

Remove env_logger depedency

The env logger has been broken for over a year and is not used by anyone
as far as I know. This removes this option entirely in favor of
Alacritty's built-in logger level selection flags.
This commit is contained in:
Christian Duerr 2020-05-29 06:22:16 +00:00 committed by GitHub
parent 2b2b2bfd2a
commit f1bf481eb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions

View file

@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Minimum Rust version has been bumped to 1.41.0 - Minimum Rust version has been bumped to 1.41.0
- Prebuilt Linux binaries have been removed - Prebuilt Linux binaries have been removed
### Removed
- Environment variable `RUST_LOG` for selecting the log level
### Added ### Added
- Default Command+N keybinding for SpawnNewInstance on macOS - Default Command+N keybinding for SpawnNewInstance on macOS

1
Cargo.lock generated
View file

@ -21,7 +21,6 @@ dependencies = [
"clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"embed-resource 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "embed-resource 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
"font 0.1.0", "font 0.1.0",
"gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -13,7 +13,6 @@ alacritty_terminal = { path = "../alacritty_terminal", default-features = false
clap = "2" clap = "2"
log = "0.4" log = "0.4"
time = "0.1.40" time = "0.1.40"
env_logger = "0.7.1"
fnv = "1" fnv = "1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_yaml = "0.8" serde_yaml = "0.8"

View file

@ -42,18 +42,12 @@ pub fn initialize(
) -> Result<Option<PathBuf>, log::SetLoggerError> { ) -> Result<Option<PathBuf>, log::SetLoggerError> {
log::set_max_level(options.log_level); log::set_max_level(options.log_level);
// Use env_logger if RUST_LOG environment variable is defined. Otherwise,
// use the alacritty-only logger.
if std::env::var("RUST_LOG").is_ok() {
env_logger::try_init()?;
Ok(None)
} else {
let logger = Logger::new(event_proxy); let logger = Logger::new(event_proxy);
let path = logger.file_path(); let path = logger.file_path();
log::set_boxed_logger(Box::new(logger))?; log::set_boxed_logger(Box::new(logger))?;
Ok(path) Ok(path)
} }
}
pub struct Logger { pub struct Logger {
logfile: Mutex<OnDemandLogFile>, logfile: Mutex<OnDemandLogFile>,