From 0a3f013e00693d2475589f67d70bd5cd8d94004d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 22 Mar 2022 11:44:54 -0700 Subject: [PATCH] Use env_logger when running the app in a terminal --- crates/zed/Cargo.toml | 1 + crates/zed/src/main.rs | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index b0e5a63137dcbd6b8a0cdde080b99772f87e9447..cbf9389fd4028213aa8c23ad8183e0419f0f6634 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -64,6 +64,7 @@ crossbeam-channel = "0.5.0" ctor = "0.1.20" dirs = "3.0" easy-parallel = "3.1.0" +env_logger = "0.8" futures = "0.3" http-auth-basic = "0.1.3" ignore = "0.4" diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 05437834942508a63ad067b3bfcbb9e57f4a8f35..61967bfcdfb00738c56d52fa228041a30f9e90ce 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -9,7 +9,6 @@ use gpui::{App, AssetSource, Task}; use log::LevelFilter; use parking_lot::Mutex; use project::Fs; -use simplelog::SimpleLogger; use smol::process::Command; use std::{env, fs, path::PathBuf, sync::Arc}; use theme::{ThemeRegistry, DEFAULT_THEME_NAME}; @@ -142,11 +141,10 @@ fn main() { } fn init_logger() { - let level = LevelFilter::Info; - if stdout_is_a_pty() { - SimpleLogger::init(level, Default::default()).expect("could not initialize logger"); + env_logger::init(); } else { + let level = LevelFilter::Info; let log_dir_path = dirs::home_dir() .expect("could not locate home directory for logging") .join("Library/Logs/");