use $WEZTERM_LOG to configure log levels ad-hoc

80214319ae broke the use of RUST_LOG to
turn up trace logging.

This commit refactors logger initialization into the env-bootstrap crate
so that it is centralized, and adopts the use of `WEZTERM_LOG` to
override the default logging filters, rather than `RUST_LOG`.

Cargo.lock

@@ -1131,7 +1131,9 @@ dependencies = [
  "config",
  "dirs-next",
  "libc",
+ "log",
  "objc",
+ "pretty_env_logger",
 ]
 
 [[package]]
@@ -4393,7 +4395,6 @@ dependencies = [
  "log",
  "mux",
  "portable-pty",
- "pretty_env_logger",
  "promise",
  "structopt",
  "tabout",
@@ -4498,7 +4499,6 @@ dependencies = [
  "openssl",
  "palette",
  "portable-pty",
- "pretty_env_logger",
  "promise",
  "pulldown-cmark",
  "rangeset",
@@ -4565,7 +4565,6 @@ dependencies = [
  "mux",
  "openssl",
  "portable-pty",
- "pretty_env_logger",
  "promise",
  "rangeset",
  "rcgen",

docs/changelog.markdown

@@ -31,6 +31,7 @@ brief notes about them may accumulate here.
 * New: added `line_height` configuration option to scale the computed cell height. The default is `1.0`, resulting in using the font-specified metrics. Setting it to `1.2` will result in a 20% larger cell height.
 * macOS: Fixed an issue where hovering over the split between panes could result in wezterm becoming unresponsive [#391](https://github.com/wez/wezterm/issues/391)
 * Closing windows will now prompt for confirmation before proceeding with the close.  Added `window_close_confirmation` to control this; valid values are `AlwaysPrompt` and `NeverPrompt`. [#280](https://github.com/wez/wezterm/issues/280)
+* Tidied up logging. Previously ERROR level logging was used to make sure that informational things showed up in the stderr stream. Now we use INFO level logging for this to avoid alarming the user.  You can set `WEZTERM_LOG=trace` in the environment to get more verbose logging for troubleshooting purposes.
 
 ### 20201101-103216-403d002d
 

env-bootstrap/Cargo.toml

@@ -9,6 +9,8 @@ edition = "2018"
 [dependencies]
 config = { path = "../config" }
 dirs-next = "2.0"
+log = "0.4"
+pretty_env_logger = "0.4"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 cocoa = "0.20"

env-bootstrap/src/lib.rs

@@ -9,6 +9,16 @@ pub fn set_wezterm_executable() {
     }
 }
 
+pub fn setup_logger() {
+    let mut builder = pretty_env_logger::formatted_timed_builder();
+    if let Ok(s) = std::env::var("WEZTERM_LOG") {
+        builder.parse_filters(&s);
+    } else {
+        builder.filter(None, log::LevelFilter::Info);
+    }
+    builder.init();
+}
+
 pub fn fixup_appimage() {
     if let Some(appimage) = std::env::var_os("APPIMAGE") {
         let appimage = std::path::PathBuf::from(appimage);
@@ -118,4 +128,6 @@ pub fn bootstrap() {
     set_lang_from_locale();
 
     fixup_appimage();
+
+    setup_logger();
 }

wezterm-gui/Cargo.toml

@@ -38,7 +38,6 @@ open = "1.4"
 openssl = "0.10"
 palette = "0.5"
 portable-pty = { path = "../pty", features = ["serde_support", "ssh"]}
-pretty_env_logger = "0.4"
 promise = { path = "../promise" }
 pulldown-cmark = "0.8"
 rangeset = { path = "../rangeset" }

wezterm-gui/src/main.rs

@@ -416,9 +416,6 @@ fn run() -> anyhow::Result<()> {
 
     env_bootstrap::bootstrap();
 
-    pretty_env_logger::formatted_timed_builder()
-        .filter(None, log::LevelFilter::Info)
-        .init();
     stats::Stats::init()?;
     let _saver = umask::UmaskSaver::new();
 

wezterm-mux-server/Cargo.toml

@@ -20,7 +20,6 @@ log = "0.4"
 mux = { path = "../mux" }
 openssl = "0.10"
 portable-pty = { path = "../pty", features = ["serde_support"]}
-pretty_env_logger = "0.4"
 promise = { path = "../promise" }
 rangeset = { path = "../rangeset" }
 rcgen = "0.8"

wezterm-mux-server/src/main.rs

@@ -45,9 +45,6 @@ struct Opt {
 }
 
 fn main() {
-    pretty_env_logger::formatted_timed_builder()
-        .filter(None, log::LevelFilter::Info)
-        .init();
     if let Err(err) = run() {
         log::error!("{:#}", err);
         std::process::exit(1);

wezterm/Cargo.toml

@@ -19,7 +19,6 @@ hostname = "0.3"
 log = "0.4"
 mux = { path = "../mux" }
 portable-pty = { path = "../pty" }
-pretty_env_logger = "0.4"
 promise = { path = "../promise" }
 structopt = "0.3"
 tabout = { path = "../tabout" }

wezterm/src/main.rs

@@ -223,9 +223,6 @@ fn main() {
 fn run() -> anyhow::Result<()> {
     env_bootstrap::bootstrap();
 
-    pretty_env_logger::formatted_timed_builder()
-        .filter(None, log::LevelFilter::Info)
-        .init();
     let _saver = umask::UmaskSaver::new();
 
     let opts = Opt::from_args();