Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report the correct app version when sending panics to server

Browse source 
Previously, we were just relying on the `ZED_APP_VERSION` environment
variable without consulting `Platform::app_version`. That would always
report "dev" as the app version because `ZED_APP_VERSION` is only used
for testing.
This commit is contained in:
Antonio Scandurra 2022-06-02 13:00:21 +02:00
parent a8cde09070
commit 7ecc67bcd5
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/zed/src/main.rs
View file

@ -55,7 +55,10 @@ fn main() {
init_logger(&logs_dir_path); init_logger(&logs_dir_path);
let mut app = gpui::App::new(Assets).unwrap(); let mut app = gpui::App::new(Assets).unwrap();
init_panic_hook(logs_dir_path, http.clone(), app.background()); let app_version = ZED_APP_VERSION
.or_else(|| app.platform().app_version().ok())
.map_or("dev".to_string(), |v| v.to_string());
init_panic_hook(logs_dir_path, app_version, http.clone(), app.background());
load_embedded_fonts(&app); load_embedded_fonts(&app);
@ -258,7 +261,12 @@ fn init_logger(logs_dir_path: &Path) {
} }
} }
fn init_panic_hook(logs_dir_path: PathBuf, http: Arc<dyn HttpClient>, background: Arc<Background>) { fn init_panic_hook(
logs_dir_path: PathBuf,
app_version: String,
http: Arc<dyn HttpClient>,
background: Arc<Background>,
) {
background background
.spawn({ .spawn({
let logs_dir_path = logs_dir_path.clone(); let logs_dir_path = logs_dir_path.clone();
@ -321,7 +329,6 @@ fn init_panic_hook(logs_dir_path: PathBuf, http: Arc<dyn HttpClient>, background
}) })
.detach(); .detach();
let app_version = ZED_APP_VERSION.map_or("dev".to_string(), |v| v.to_string());
let is_pty = stdout_is_a_pty(); let is_pty = stdout_is_a_pty();
panic::set_hook(Box::new(move |info| { panic::set_hook(Box::new(move |info| {
let backtrace = Backtrace::new(); let backtrace = Backtrace::new();