refactor: Use miette error-diagnostic library

This commit is contained in:
Jill 2022-05-19 12:39:20 +02:00
parent 05b5efc8bf
commit 7e8f445967
Signed by untrusted user: KokaKiwi
GPG key ID: 09A5A2688F13FAC1
3 changed files with 17 additions and 8 deletions

View file

@ -6,8 +6,12 @@ edition = "2021"
[dependencies]
bytes = "1.1"
miette = "4.7"
thiserror = "1.0"
tracing = "0.1"
tracing-futures = "0.2"
# IMAP
imap-codec = "0.5"
@ -16,11 +20,13 @@ imap-codec = "0.5"
async-compat = "0.2"
futures = "0.3"
pin-project = "1.0"
tokio = { version = "1.18", features = ["full"] }
tokio-tower = "0.6"
tower = { version = "0.4", features = ["full"] }
[dev-dependencies]
eyre = "0.6"
miette = { version = "4.7", features = ["fancy"] }
tracing-subscriber = "0.3"
console-subscriber = "0.1"

View file

@ -1,8 +1,9 @@
use miette::{IntoDiagnostic, Result};
use boitalettres::proto::{Request, Response};
use boitalettres::server::accept::addr::{AddrIncoming, AddrStream};
use boitalettres::server::Server;
async fn handle_req(req: Request) -> eyre::Result<Response> {
async fn handle_req(req: Request) -> Result<Response> {
use imap_codec::types::response::Status;
tracing::debug!("Got request: {:#?}", req);
@ -13,10 +14,12 @@ async fn handle_req(req: Request) -> eyre::Result<Response> {
}
#[tokio::main]
async fn main() -> eyre::Result<()> {
async fn main() -> Result<()> {
setup_logging();
let incoming = AddrIncoming::new("127.0.0.1:4567").await?;
let incoming = AddrIncoming::new("127.0.0.1:4567")
.await
.into_diagnostic()?;
let make_service = tower::service_fn(|addr: &AddrStream| {
tracing::debug!(remote_addr = %addr.remote_addr, local_addr = %addr.local_addr, "accept");
@ -29,9 +32,8 @@ async fn main() -> eyre::Result<()> {
});
let server = Server::new(incoming).serve(make_service);
let _ = server.await?;
Ok(())
server.await.map_err(Into::into)
}
// Don't mind this, this is just for debugging.

View file

@ -15,8 +15,8 @@ mod conn;
mod pipeline;
mod service;
#[derive(Debug, thiserror::Error)]
pub enum Error<A> {
#[derive(Debug, thiserror::Error, miette::Diagnostic)]
pub enum Error<A: std::error::Error + 'static> {
#[error("Error occured when accepting new connections")]
Accept(#[source] A),
#[error("Error occured on service creation")]
@ -50,6 +50,7 @@ impl<I, S> Future for Server<I, S>
where
I: Accept,
I::Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
I::Error: 'static,
S: MakeServiceRef<I::Conn, Request, Response = Response>,
S::MakeError: Into<tower::BoxError> + std::fmt::Display,
S::Error: std::fmt::Display,