migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 21:00:03 -04:00
Code Activity

Log warning instead of error when failing to decode RON in storage (#2961)

Browse Source 
* Log warning instead of error when failing to decode RON in storage

* New web demo

* Clean up some warn/error logging

* Avoid deadlock that could happen on crash

* Log errors using console.warn, because console.error can cause crashes

* Use patched version of wasm-bindgen-cli, allowing >2GB memory

* New web demo
This commit is contained in:
Emil Ernerfeldt
2023-04-27 09:45:44 +02:00
committed by GitHub
parent f76eefb98d
commit 3d6a15f442
10 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/eframe/src/web/backend.rs
View File

@@ -529,7 +529,7 @@ impl AppRunnerRef {
log::debug!("Unsubscribing from {} events", events_to_unsubscribe.len());
for x in events_to_unsubscribe {
if let Err(err) = x.unsubscribe() {
log::error!("Failed to unsubscribe from event: {err:?}");
log::warn!("Failed to unsubscribe from event: {err:?}");
}
}
}
@@ -560,7 +560,7 @@ impl AppRunnerRef {
if self.has_panicked() {
None
} else {
let lock = self.runner.borrow_mut();
let lock = self.runner.try_borrow_mut().ok()?;
if lock.is_destroyed.fetch() {
None
} else {

2
crates/eframe/src/web/mod.rs
View File

@@ -192,7 +192,7 @@ pub fn set_clipboard_text(s: &str) {
let future = wasm_bindgen_futures::JsFuture::from(promise);
let future = async move {
if let Err(err) = future.await {
log::error!("Copy/cut action denied: {:?}", err);
log::error!("Copy/cut action failed: {err:?}");
}
};
wasm_bindgen_futures::spawn_local(future);

4
crates/eframe/src/web/storage.rs
View File

@@ -18,7 +18,7 @@ pub fn load_memory(ctx: &egui::Context) {
ctx.memory_mut(|m| *m = memory);
}
Err(err) => {
log::error!("Failed to parse memory RON: {}", err);
log::warn!("Failed to parse memory RON: {err}");
}
}
}
@@ -34,7 +34,7 @@ pub fn save_memory(ctx: &egui::Context) {
local_storage_set("egui_memory_ron", &ron);
}
Err(err) => {
log::error!("Failed to serialize memory as RON: {}", err);
log::warn!("Failed to serialize memory as RON: {err}");
}
}
}

14
crates/eframe/src/web/web_logger.rs
View File

@@ -37,7 +37,11 @@ impl log::Log for WebLogger {
log::Level::Debug => console::debug(&msg),
log::Level::Info => console::info(&msg),
log::Level::Warn => console::warn(&msg),
log::Level::Error => console::error(&msg),
// Using console.error causes crashes for unknown reason
// https://github.com/emilk/egui/pull/2961
// log::Level::Error => console::error(&msg),
log::Level::Error => console::warn(&format!("ERROR: {msg}")),
}
}
@@ -66,9 +70,11 @@ mod console {
#[wasm_bindgen(js_namespace = console)]
pub fn warn(s: &str);
/// `console.error`
#[wasm_bindgen(js_namespace = console)]
pub fn error(s: &str);
// Using console.error causes crashes for unknown reason
// https://github.com/emilk/egui/pull/2961
// /// `console.error`
// #[wasm_bindgen(js_namespace = console)]
// pub fn error(s: &str);
}
}