aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server/src/main.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-11-30 19:19:28 +0000
committerGitHub <[email protected]>2019-11-30 19:19:28 +0000
commit780f476b4f438d473bc2e2299c2b8bf0a6fb9257 (patch)
treede3a3eceb92c9604bc14c12885ce887186c39dd3 /crates/ra_lsp_server/src/main.rs
parent9712889ee4c6cffa37c2ace5da9b00bf29adab56 (diff)
parent3fe539ce51f417605a6da6bc3c6d135053b1ee67 (diff)
Merge #2451
2451: Use env_logger instead of flexi_logger r=matklad a=AlexanderEkdahl This fixes https://github.com/rust-analyzer/rust-analyzer/issues/2335 - By default only `error` will be printed. From what I can tell this matches the current behaviour. Configured through `RUST_LOG`. - I looked through the optional dependencies for `env_logger`and I have only enabled `human_time`. Without this feature no timestamp will be shown for log messages. - `RA_LOG_DIR` feature is removed This PR adds 2 new dependencies(`env_logger` and `human_time`) and removes 6 dependencies. Co-authored-by: Alexander Ekdahl <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main.rs')
-rw-r--r--crates/ra_lsp_server/src/main.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index e13c8ca14..8076a7fa5 100644
--- a/crates/ra_lsp_server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -1,6 +1,5 @@
1//! `ra_lsp_server` binary 1//! `ra_lsp_server` binary
2 2
3use flexi_logger::{Duplicate, Logger};
4use lsp_server::Connection; 3use lsp_server::Connection;
5use ra_lsp_server::{show_message, Result, ServerConfig}; 4use ra_lsp_server::{show_message, Result, ServerConfig};
6use ra_prof; 5use ra_prof;
@@ -14,11 +13,7 @@ fn main() -> Result<()> {
14fn setup_logging() -> Result<()> { 13fn setup_logging() -> Result<()> {
15 std::env::set_var("RUST_BACKTRACE", "short"); 14 std::env::set_var("RUST_BACKTRACE", "short");
16 15
17 let logger = Logger::with_env_or_str("error").duplicate_to_stderr(Duplicate::All); 16 env_logger::try_init()?;
18 match std::env::var("RA_LOG_DIR") {
19 Ok(ref v) if v == "1" => logger.log_to_file().directory("log").start()?,
20 _ => logger.start()?,
21 };
22 17
23 ra_prof::set_filter(match std::env::var("RA_PROFILE") { 18 ra_prof::set_filter(match std::env::var("RA_PROFILE") {
24 Ok(spec) => ra_prof::Filter::from_spec(&spec), 19 Ok(spec) => ra_prof::Filter::from_spec(&spec),