zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid clobbering panic files when they happen at the same time

Browse Source 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-03-02 20:51:29 -08:00
parent 24ba47e75d
commit a598f0b13c
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/zed/src/main.rs
View File

@ -13,7 +13,6 @@ use client::{
http::{self, HttpClient}, http::{self, HttpClient},
UserStore, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN, UserStore, ZED_APP_VERSION, ZED_SECRET_CLIENT_TOKEN,
}; };
use futures::{ use futures::{
channel::{mpsc, oneshot}, channel::{mpsc, oneshot},
FutureExt, SinkExt, StreamExt, FutureExt, SinkExt, StreamExt,
@ -31,8 +30,10 @@ use settings::{
}; };
use simplelog::ConfigBuilder; use simplelog::ConfigBuilder;
use smol::process::Command; use smol::process::Command;
use std::{env, ffi::OsStr, panic, path::PathBuf, sync::Arc, thread, time::Duration}; use std::{
use std::{fs::OpenOptions, os::unix::prelude::OsStrExt}; env, ffi::OsStr, fs::OpenOptions, io::Write as _, os::unix::prelude::OsStrExt, panic,
path::PathBuf, sync::Arc, thread, time::Duration,
};
use terminal_view::{get_working_directory, TerminalView}; use terminal_view::{get_working_directory, TerminalView};
use fs::RealFs; use fs::RealFs;
@ -330,13 +331,18 @@ fn init_panic_hook(app_version: String) {
), ),
}; };
let panic_filename = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string(); let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
std::fs::write( let panic_file_path =
paths::LOGS_DIR.join(format!("zed-{}-{}.panic", app_version, panic_filename)), paths::LOGS_DIR.join(format!("zed-{}-{}.panic", app_version, timestamp));
&message, let panic_file = std::fs::OpenOptions::new()
) .append(true)
.context("error writing panic to disk") .create(true)
.log_err(); .open(&panic_file_path)
.log_err();
if let Some(mut panic_file) = panic_file {
write!(&mut panic_file, "{}", message).log_err();
panic_file.flush().log_err();
}
if is_pty { if is_pty {
eprintln!("{}", message); eprintln!("{}", message);