zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-22 19:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Logging cleanup

Browse Source
This commit is contained in:
Jeremy Wall 2022-07-20 17:58:44 -04:00
parent bf97f1ed29
commit 3dd18aacb0
5 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Cargo.lock generated
View File

@ -790,7 +790,7 @@ dependencies = [
"serde_json",
"sycamore",
"tracing",
"tracing-wasm",
"tracing-browser-subscriber",
"wasm-bindgen",
"web-sys",
]
@ -1591,6 +1591,15 @@ dependencies = [
"syn",
]
[[package]]
name = "tracing-browser-subscriber"
version = "0.1.0"
dependencies = [
"tracing",
"tracing-subscriber",
"wasm-bindgen",
]
[[package]]
name = "tracing-core"
version = "0.1.28"
@ -1626,17 +1635,6 @@ dependencies = [
"tracing-log",
]
[[package]]
name = "tracing-wasm"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07"
dependencies = [
"tracing",
"tracing-subscriber",
"wasm-bindgen",
]
[[package]]
name = "try-lock"
version = "0.2.3"
@ -1819,9 +1817,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "wasm-bindgen"
version = "0.2.78"
version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
dependencies = [
"cfg-if",
"serde",
@ -1831,9 +1829,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.78"
version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
dependencies = [
"bumpalo",
"lazy_static",
@ -1858,9 +1856,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.78"
version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -1868,9 +1866,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.78"
version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
dependencies = [
"proc-macro2",
"quote",
@ -1881,9 +1879,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.78"
version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
[[package]]
name = "web-sys"

2
web/Cargo.toml
View File

@ -19,7 +19,7 @@ reqwasm = "0.5.0"
console_error_panic_hook = "0.1.7"
serde_json = "1.0.79"
tracing = "0.1.35"
tracing-wasm = "0.2.1"
tracing-browser-subscriber = {path = "/Users/zaphar/projects/tracing-browser-console"}
[dependencies.wasm-bindgen]
# we need wasm-bindgen v0.2.78 exactly

2
web/src/components/recipe_selection.rs
View File

@ -41,7 +41,7 @@ pub fn recipe_selection(props: RecipeCheckBoxProps) -> View<G> {
label(for=id_cloned_2) { (props.title.get()) }
input(type="number", class="item-count-sel", min="0", bind:value=count.clone(), name=format!("recipe_id:{}", i), value=id_as_str.clone(), on:change=move |_| {
let mut app_service = app_service.clone();
debug!(idx=%i, count=*count.get(), "setting recipe count");
debug!(idx=%i, count=%(*count.get()), "setting recipe count");
app_service.set_recipe_count_by_index(i, count.get().parse().unwrap());
})
}

5
web/src/lib.rs
View File

@ -20,7 +20,7 @@ mod web;
use sycamore::prelude::*;
#[cfg(feature = "web")]
use tracing_wasm;
use tracing_browser_subscriber;
use wasm_bindgen::prelude::wasm_bindgen;
use web::UI;
@ -29,7 +29,8 @@ use web::UI;
pub fn main() {
if cfg!(feature = "web") {
console_error_panic_hook::set_once();
tracing_wasm::set_as_global_default();
// TODO(jwall): use the tracing_subscriber_browser default setup function when it exists.
tracing_browser_subscriber::configure_as_global_default();
}
sycamore::render(|| view! { UI() });
}

8
web/src/router_integration.rs
View File

@ -119,10 +119,10 @@ where
create_effect(
cloned!((view_signal, integration, route_select) => move || {
let path_signal = integration.0.clone();
debug!("new path: {:?}", path_signal.get());
debug!(origin=%path_signal.get().0, path=%path_signal.get().1, hash=%path_signal.get().2, "new path");
let path = path_signal.clone();
let route = R::from(path.get().as_ref());
debug!("new route: {:?}", &route);
debug!(?route, "new route");
// TODO(jwall): this is an unnecessary use of signal.
let view = route_select.as_ref()(Signal::new(route).handle());
register_click_handler(&view, integration.clone());
@ -174,7 +174,7 @@ pub trait DeriveRoute {
impl DeriveRoute for AppRoutes {
#[instrument]
fn from(input: &(String, String, String)) -> AppRoutes {
debug!("routing: {input:?}");
debug!(origin=%input.0, path=%input.1, hash=%input.2, "routing");
match input.2.as_str() {
"" => AppRoutes::default(),
"#plan" => AppRoutes::Plan,
@ -191,7 +191,7 @@ impl DeriveRoute for AppRoutes {
};
}
}
error!("Path not found: [{:?}]", input);
error!(origin=%input.0, path=%input.1, hash=%input.2, "Path not found");
AppRoutes::NotFound
}
}