mirrors/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

style(client): refactor check

Browse source
This commit is contained in:
Matthew Esposito 2024-11-21 14:22:48 -05:00
parent f5096c3028
commit decfe82e2b
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/main.rs
View file

@ -11,7 +11,7 @@ use std::str::FromStr;
use futures_lite::FutureExt; use futures_lite::FutureExt;
use hyper::Uri; use hyper::Uri;
use hyper::{header::HeaderValue, Body, Request, Response}; use hyper::{header::HeaderValue, Body, Request, Response};
use log::info; use log::{error, info};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use redlib::client::{canonical_path, proxy, CLIENT}; use redlib::client::{canonical_path, proxy, CLIENT};
use redlib::server::{self, RequestExt}; use redlib::server::{self, RequestExt};
@ -377,23 +377,15 @@ async fn main() {
println!("Performing self-test..."); println!("Performing self-test...");
{ {
let mut sp = Spinner::new(Spinners::Dots12, "Requesting /r/popular...".into()); let mut sp = Spinner::new(Spinners::Dots12, "Requesting /r/popular...".into());
match self_check().await {
let request = Request::builder().uri("/").method("GET").body(Body::empty()).unwrap(); Ok(()) => sp.stop_with_message("✅ Request successful!".into()),
let response = community(request).await;
match response {
Ok(sub) => {
if sub.status().is_success() {
sp.stop_with_message("✅ Request successful!".into());
} else {
sp.stop_with_message(format!("❌ Request failed: {}", sub.status()));
panic!("Self-test failed");
}
}
Err(e) => { Err(e) => {
sp.stop_with_message(format!("❌ Request failed: {e}")); sp.stop_with_message(format!("❌ Request failed: {}", e));
error!("Self-test failed: {}", e);
error!("Please update to the latest version. Then, check the issue tracker for the latest error.");
error!("https://github.com/redlib-org/redlib/issues");
panic!("Self-test failed"); panic!("Self-test failed");
} },
} }
} }
@ -444,3 +436,13 @@ async fn fetch_instances() -> String {
hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect() hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect()
} }
async fn self_check() -> Result<(), String> {
let request = Request::get("/").body(Body::empty()).unwrap();
match community(request).await {
Ok(sub) if sub.status().is_success() => Ok(()),
Ok(sub) => Err(sub.status().to_string()),
Err(e) => Err(e),
}
}