shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tabs before some messages for clearer reasoning on what happen on each request

Browse Source
This commit is contained in:
shockrah 2020-07-29 19:44:52 -07:00
parent 7ea3aef1cb
commit 362eb53650
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/auth.rs
View File

@ -37,7 +37,7 @@ pub async fn wall_entry(path: &str, pool: &Pool, params: &serde_json::Value) ->
} }
} }
Err(e) => { Err(e) => {
println!("Issue fetching auth data {:?}", e); println!("\tIssue fetching auth data {:?}", e);
Ok(AuthReason::NoKey) Ok(AuthReason::NoKey)
} }
} }

12
server/src/main.rs
View File

@ -33,7 +33,6 @@ mod db_types;
async fn route_dispatcher(pool: &Pool, resp: &mut Response<Body>, meth: &Method, path: &str, params: serde_json::Value) { async fn route_dispatcher(pool: &Pool, resp: &mut Response<Body>, meth: &Method, path: &str, params: serde_json::Value) {
// At some point we should have some way of hiding this obnoxious complexity // At some point we should have some way of hiding this obnoxious complexity
use routes::resolve_dynamic_route; use routes::resolve_dynamic_route;
println!("{}: {}", meth, path);
match (meth, path) { match (meth, path) {
(&Method::GET, routes::INVITE_JOIN) => { (&Method::GET, routes::INVITE_JOIN) => {
if let Err(_) = invites::route_join_invite_code(pool, resp, params).await { if let Err(_) = invites::route_join_invite_code(pool, resp, params).await {
@ -60,11 +59,11 @@ async fn route_dispatcher(pool: &Pool, resp: &mut Response<Body>, meth: &Method,
// we're not doing any heavy calculations at any point // we're not doing any heavy calculations at any point
if let Some(route) = resolve_dynamic_route(path) { if let Some(route) = resolve_dynamic_route(path) {
*resp.status_mut() = StatusCode::OK; *resp.status_mut() = StatusCode::OK;
println!("Static part: {}", route.base); println!("\tStatic part: {}", route.base);
println!("Dynamic part: {}", route.dynamic); println!("\tDynamic part: {}", route.dynamic);
} }
else { else {
println!("NOT FOUND: {}: {}", meth, path); println!("\tNOT FOUND: {}: {}", meth, path);
*resp.status_mut() = StatusCode::NOT_FOUND *resp.status_mut() = StatusCode::NOT_FOUND
} }
} }
@ -78,6 +77,7 @@ async fn main_responder(request: Request<Body>) -> Result<Response<Body>, hyper:
let (parts, mut body) = request.into_parts(); let (parts, mut body) = request.into_parts();
let method = parts.method; let method = parts.method;
let path = parts.uri.path(); let path = parts.uri.path();
println!("{}: {}", method, path);
let params_res = http_params::parse_params(&mut body).await; let params_res = http_params::parse_params(&mut body).await;
@ -88,7 +88,7 @@ async fn main_responder(request: Request<Body>) -> Result<Response<Body>, hyper:
match auth_result { match auth_result {
OpenAuth | Good => route_dispatcher(&pool, &mut response, &method, path, params).await, OpenAuth | Good => route_dispatcher(&pool, &mut response, &method, path, params).await,
NoKey => { NoKey => {
println!("AUTH: NoKey/BadKey"); println!("\tAUTH: NoKey/BadKey");
*response.status_mut() = StatusCode::UNAUTHORIZED *response.status_mut() = StatusCode::UNAUTHORIZED
}, },
} }
@ -98,7 +98,7 @@ async fn main_responder(request: Request<Body>) -> Result<Response<Body>, hyper:
} }
} }
else { else {
println!("PARSER: Parameter parsing failed"); println!("\tPARSER: Parameter parsing failed");
*response.status_mut() = StatusCode::BAD_REQUEST; *response.status_mut() = StatusCode::BAD_REQUEST;
} }
Ok(response) Ok(response)