syndicate-lang
/
syndicate-rs
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Clean up logging

This commit is contained in:
Tony Garnock-Jones 2023-11-17 12:50:17 +01:00
parent b1e20ac706
commit abb2978b9a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syndicate-server/src/http.rs
View File

@ -172,7 +172,7 @@ pub async fn serve(
query, query,
body, body,
}; };
tracing::info!(?sreq); tracing::trace!(?sreq);
let srep = Cap::guard(&language().syndicate, t.create(ResponseCollector::new(tx))); let srep = Cap::guard(&language().syndicate, t.create(ResponseCollector::new(tx)));
httpd.assert(t, language(), &http::HttpContext { req: sreq, res: srep }); httpd.assert(t, language(), &http::HttpContext { req: sreq, res: srep });
Ok(()) Ok(())

17
syndicate-server/src/protocol.rs
View File

@ -1,5 +1,6 @@
use futures::SinkExt; use futures::SinkExt;
use futures::StreamExt; use futures::StreamExt;
use hyper::header::HeaderValue;
use hyper::service::service_fn; use hyper::service::service_fn;
use std::future::ready; use std::future::ready;
@ -64,7 +65,7 @@ pub async fn detect_protocol(
match stream.peek(&mut buf).await? { match stream.peek(&mut buf).await? {
1 => match buf[0] { 1 => match buf[0] {
v if v == b'[' /* Turn */ || v == b'<' /* Error and Extension */ || v >= 128 => { v if v == b'[' /* Turn */ || v == b'<' /* Error and Extension */ || v >= 128 => {
tracing::info!(protocol = %"raw", peer = ?addr); tracing::info!(protocol = %(if v >= 128 { "application/syndicate" } else { "text/syndicate" }), peer = ?addr);
let (i, o) = stream.into_split(); let (i, o) = stream.into_split();
let i = relay::Input::Bytes(Box::pin(i)); let i = relay::Input::Bytes(Box::pin(i));
let o = relay::Output::Bytes(Box::pin(o /* BufWriter::new(o) */)); let o = relay::Output::Bytes(Box::pin(o /* BufWriter::new(o) */));
@ -80,7 +81,10 @@ pub async fn detect_protocol(
let service = service_fn(|mut req| enclose!( let service = service_fn(|mut req| enclose!(
(upgraded, keepalive, trace_collector, facet, gateway, httpd) async move { (upgraded, keepalive, trace_collector, facet, gateway, httpd) async move {
if hyper_tungstenite::is_upgrade_request(&req) { if hyper_tungstenite::is_upgrade_request(&req) {
tracing::info!(protocol = %"websocket", ?req); tracing::info!(protocol = %"websocket",
method=%req.method(),
uri=?req.uri(),
host=?req.headers().get("host").unwrap_or(&HeaderValue::from_static("")));
let (response, websocket) = hyper_tungstenite::upgrade(&mut req, None) let (response, websocket) = hyper_tungstenite::upgrade(&mut req, None)
.map_err(|e| message_error(e))?; .map_err(|e| message_error(e))?;
upgraded.store(true, Ordering::SeqCst); upgraded.store(true, Ordering::SeqCst);
@ -100,7 +104,10 @@ pub async fn detect_protocol(
None => Ok(crate::http::empty_response( None => Ok(crate::http::empty_response(
hyper::StatusCode::SERVICE_UNAVAILABLE)), hyper::StatusCode::SERVICE_UNAVAILABLE)),
Some(httpd) => { Some(httpd) => {
tracing::info!(protocol = %"http", ?req); tracing::info!(protocol = %"http",
method=%req.method(),
uri=?req.uri(),
host=?req.headers().get("host").unwrap_or(&HeaderValue::from_static("")));
crate::http::serve(trace_collector, facet, httpd, req, server_port).await crate::http::serve(trace_collector, facet, httpd, req, server_port).await
} }
} }
@ -108,9 +115,9 @@ pub async fn detect_protocol(
})); }));
http.serve_connection(stream, service).with_upgrades().await?; http.serve_connection(stream, service).with_upgrades().await?;
if upgraded.load(Ordering::SeqCst) { if upgraded.load(Ordering::SeqCst) {
tracing::info!("serve_connection completed after upgrade to websocket"); tracing::debug!("serve_connection completed after upgrade to websocket");
} else { } else {
tracing::info!("serve_connection completed after regular HTTP session"); tracing::debug!("serve_connection completed after regular HTTP session");
facet.activate(&Account::new(None, None), None, |t| Ok(t.stop())); facet.activate(&Account::new(None, None), None, |t| Ok(t.stop()));
} }
Ok(()) Ok(())