archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix log usages

Browse Source
This commit is contained in:
Maximilian Ammann 2022-04-06 17:25:56 +02:00
parent 37a29539d7
commit 32fa82145c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/web/mod.rs
View File

@ -35,7 +35,7 @@ pub const COLOR_TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8
#[wasm_bindgen(start)]
pub fn wasm_bindgen_start() {
if let Err(_) = console_log::init_with_level(Level::Info) {
if let Err(_) = console_log::init_with_level(log::Level::Info) {
// Failed to initialize logging. No need to log a message.
}
panic::set_hook(Box::new(console_error_panic_hook::hook));

13
src/platform/web/pool.rs
View File

@ -50,7 +50,7 @@ impl WorkerPool {
state: Rc::new(PoolState {
workers: RefCell::new(Vec::with_capacity(initial)),
callback: Closure::wrap(Box::new(|event: Event| {
warn!("unhandled event: {}", event.type_());
log::error!("unhandled event: {}", event.type_());
}) as Box<dyn FnMut(Event)>),
}),
};
@ -72,17 +72,14 @@ impl WorkerPool {
/// Returns any error that may happen while a JS web worker is created and a
/// message is sent to it.
fn spawn(&self) -> Result<Worker, JsValue> {
info!("spawning new worker");
log::info!("spawning new worker");
// TODO: what do do about `./worker.js`:
//
// * the path is only known by the bundler. How can we, as a
// library, know what's going on?
// * How do we not fetch a script N times? It internally then
// causes another script to get fetched N times...
warn!("New worker spawned");
/*let maybe_worker = new_worker();
assert!(maybe_worker.is_instance_of::<Worker>());
let worker: Worker = maybe_worker.dyn_into().unwrap();*/
let worker = (self.new_worker)();
// With a worker spun up send it the module/memory so it can start
@ -159,7 +156,7 @@ impl WorkerPool {
let slot2 = reclaim_slot.clone();
let reclaim = Closure::wrap(Box::new(move |event: Event| {
if let Some(error) = event.dyn_ref::<ErrorEvent>() {
warn!("error in worker: {}", error.message());
log::error!("error in worker: {}", error.message());
// TODO: this probably leaks memory somehow? It's sort of
// unclear what to do about errors in workers right now.
return;
@ -175,7 +172,7 @@ impl WorkerPool {
return;
}
warn!("unhandled event: {}", event.type_());
log::error!("unhandled event: {}", event.type_());
// TODO: like above, maybe a memory leak here?
}) as Box<dyn FnMut(Event)>);
worker.set_onmessage(Some(reclaim.as_ref().unchecked_ref()));