2 files changed, 10 insertions, 2 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<()> {
         }
     }
 
-    setup_logging(flags.log_file.as_deref(), flags.no_log_buffering)?;
+    let mut log_file = flags.log_file.as_deref();
+
+    let env_log_file = env::var("RA_LOG_FILE").ok();
+    if let Some(env_log_file) = env_log_file.as_deref() {
+        log_file = Some(Path::new(env_log_file));
+    }
+
+    setup_logging(log_file, flags.no_log_buffering)?;
     let verbosity = flags.verbosity();
 
     match flags.subcommand {
diff --git a/docs/dev/README.md b/docs/dev/README.md
index e81f1e74c..a394b8501 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -131,7 +131,8 @@ Logging is done by both rust-analyzer and VS Code, so it might be tricky to figu
 
 Inside rust-analyzer, we use the standard `log` crate for logging, and `env_logger` for logging frontend.
 By default, log goes to stderr, but the stderr itself is processed by VS Code.
-`--log-file <PATH>` CLI argument allows logging to file.
+`--log-file <PATH>` CLI argument allows logging to file. 
+Setting the `RA_LOG_FILE=<PATH>` environment variable will also log to file, it will also override `--log-file`.
 
 To see stderr in the running VS Code instance, go to the "Output" tab of the panel and select `rust-analyzer`.
 This shows `eprintln!` as well.