mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 02:20:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Move app version into panic object

Browse source
This commit is contained in:
Joseph Lyons 2023-06-05 14:17:48 -04:00
parent 6b89243902
commit 917d8949b7
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -372,6 +372,7 @@ struct Panic {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
location_data: Option<LocationData>, location_data: Option<LocationData>,
backtrace: Vec<String>, backtrace: Vec<String>,
app_version: String,
release_channel: String, release_channel: String,
os_name: String, os_name: String,
os_version: Option<String>, os_version: Option<String>,
@ -383,8 +384,6 @@ struct Panic {
#[derive(Serialize)] #[derive(Serialize)]
struct PanicRequest { struct PanicRequest {
panic: Panic, panic: Panic,
// TODO: Move to Panic struct, as app_version - requires changing zed.dev
version: String,
token: String, token: String,
} }
@ -471,6 +470,7 @@ fn init_panic_hook(app: &App) {
file: location.file().into(), file: location.file().into(),
line: location.line(), line: location.line(),
}), }),
app_version: app_version.clone(),
release_channel: RELEASE_CHANNEL.dev_name().into(), release_channel: RELEASE_CHANNEL.dev_name().into(),
os_name: platform.os_name().into(), os_name: platform.os_name().into(),
os_version: platform os_version: platform
@ -496,8 +496,7 @@ fn init_panic_hook(app: &App) {
} }
let timestamp = 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();
let panic_file_path = let panic_file_path = paths::LOGS_DIR.join(format!("zed-{}.panic", timestamp));
paths::LOGS_DIR.join(format!("zed-{}-{}.panic", app_version, timestamp));
let panic_file = std::fs::OpenOptions::new() let panic_file = std::fs::OpenOptions::new()
.append(true) .append(true)
.create(true) .create(true)
@ -532,15 +531,9 @@ fn upload_previous_panics(http: Arc<dyn HttpClient>, cx: &mut AppContext) {
continue; continue;
}; };
let mut components = filename.split('-'); if !filename.starts_with("zed") {
if components.next() != Some("zed") {
continue; continue;
} }
let version = if let Some(version) = components.next() {
version
} else {
continue;
};
if telemetry_settings.diagnostics { if telemetry_settings.diagnostics {
let panic_data_text = smol::fs::read_to_string(&child_path) let panic_data_text = smol::fs::read_to_string(&child_path)
@ -549,7 +542,6 @@ fn upload_previous_panics(http: Arc<dyn HttpClient>, cx: &mut AppContext) {
let body = serde_json::to_string(&PanicRequest { let body = serde_json::to_string(&PanicRequest {
panic: serde_json::from_str(&panic_data_text)?, panic: serde_json::from_str(&panic_data_text)?,
version: version.to_string(),
token: ZED_SECRET_CLIENT_TOKEN.into(), token: ZED_SECRET_CLIENT_TOKEN.into(),
}) })
.unwrap(); .unwrap();