From 8c04365049680d4520c98fc767189632b7f72f1d Mon Sep 17 00:00:00 2001 From: spikecodes <19519553+spikecodes@users.noreply.github.com> Date: Wed, 27 Jan 2021 17:48:58 -0800 Subject: [PATCH] Improve error logging --- Cargo.lock | 107 +++------------------------------------------------ Cargo.toml | 5 +-- src/utils.rs | 10 ++--- 3 files changed, 12 insertions(+), 110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 572f2db..bc668a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -346,15 +346,6 @@ dependencies = [ "toml", ] -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - [[package]] name = "async-recursion" version = "0.3.1" @@ -520,40 +511,6 @@ dependencies = [ "bytes 1.0.1", ] -[[package]] -name = "cached" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2afe73808fbaac302e39c9754bfc3c4b4d0f99c9c240b9f4e4efc841ad1b74" -dependencies = [ - "async-mutex", - "async-trait", - "cached_proc_macro", - "cached_proc_macro_types", - "futures", - "hashbrown", - "once_cell", -] - -[[package]] -name = "cached_proc_macro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf857ae42d910aede5c5186e62684b0d7a597ce2fe3bd14448ab8f7ef439848c" -dependencies = [ - "async-mutex", - "cached_proc_macro_types", - "darling", - "quote", - "syn", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" - [[package]] name = "cc" version = "1.0.66" @@ -616,41 +573,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn", -] - [[package]] name = "derive_more" version = "0.99.11" @@ -704,12 +626,6 @@ dependencies = [ "syn", ] -[[package]] -name = "event-listener" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" - [[package]] name = "flate2" version = "1.0.19" @@ -969,12 +885,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.2.0" @@ -1078,9 +988,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" +checksum = "7eb0c4e9c72ee9d69b767adebc5f4788462a3b45624acd919475c92597bcaf4f" [[package]] name = "libreddit" @@ -1090,7 +1000,6 @@ dependencies = [ "askama", "async-recursion", "base64 0.13.0", - "cached", "futures", "regex", "serde", @@ -1117,11 +1026,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -1738,12 +1647,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "syn" version = "1.0.60" diff --git a/Cargo.toml b/Cargo.toml index 63a3582..42b8bb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,10 @@ base64 = "0.13" actix-web = { version = "3.3", features = ["rustls"] } futures = "0.3" askama = "0.10" -ureq = "2.0" +ureq = "2" serde = { version = "1.0", default_features = false, features = ["derive"] } serde_json = "1.0" async-recursion = "0.3" url = "2.2" regex = "1.4" -time = "0.2" -cached = "0.23.0" +time = "0.2" \ No newline at end of file diff --git a/src/utils.rs b/src/utils.rs index 52a5637..875ac30 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -9,7 +9,7 @@ use serde_json::{from_str, Value}; use std::collections::HashMap; use time::{Duration, OffsetDateTime}; use url::Url; -use cached::proc_macro::cached; +// use cached::proc_macro::cached; // // STRUCTS @@ -461,8 +461,8 @@ pub async fn request(path: String) -> Result { // Parse the response from Reddit as JSON match from_str(&response.into_string().unwrap_or_default()) { Ok(json) => Ok(json), - Err(_) => { - dbg!(format!("{} - Failed to parse page JSON data", url)); + Err(e) => { + println!("{} - Failed to parse page JSON data: {}", url, e); Err("Failed to parse page JSON data".to_string()) } } @@ -474,8 +474,8 @@ pub async fn request(path: String) -> Result { Err("Page not found".to_string()) } // If failed to send request - Err(_e) => { - dbg!(format!("{} - {}", url, _e)); + Err(e) => { + println!("{} - Couldn't send request to Reddit: {}", url, e); Err("Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string()) } }