aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-06-21 22:42:02 +0100
committerGitHub <[email protected]>2021-06-21 22:42:02 +0100
commit37dc2dfada170c28237f7bd20dec6476a420df32 (patch)
treeeaa027c4c988548ba5843d1c5382ce808e320435 /crates
parentafe056eef1869d1733f0d62d36f15d7db3ccfa54 (diff)
parentceeee5e3c6e2ab24d6d83a1e000780da537c1507 (diff)
Merge #9348
9348: output to log file if RA_LOG_FILE is defined in environment r=rezural a=rezural This adds a check for RA_LOG_FILE, and logs to that if defined. It currently overrides flags.log_file. If this is undesirable, I will add a check. Co-authored-by: rezural <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/rust-analyzer/src/bin/main.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
index afc96505f..97246cae6 100644
--- a/crates/rust-analyzer/src/bin/main.rs
+++ b/crates/rust-analyzer/src/bin/main.rs
@@ -60,7 +60,14 @@ fn try_main() -> Result<()> {
60 } 60 }
61 } 61 }
62 62
63 setup_logging(flags.log_file.as_deref(), flags.no_log_buffering)?; 63 let mut log_file = flags.log_file.as_deref();
64
65 let env_log_file = env::var("RA_LOG_FILE").ok();
66 if let Some(env_log_file) = env_log_file.as_deref() {
67 log_file = Some(Path::new(env_log_file));
68 }
69
70 setup_logging(log_file, flags.no_log_buffering)?;
64 let verbosity = flags.verbosity(); 71 let verbosity = flags.verbosity();
65 72
66 match flags.subcommand { 73 match flags.subcommand {