vbrandl/hoc
1
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases Wiki Activity

Add custom error pages

Browse Source
This commit is contained in:
Valentin Brandl
2019-04-21 17:57:57 +02:00
parent 685b92a654
commit f832e10fac
4 changed files with 109 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/error.rs
View File

@ -1,4 +1,6 @@
use crate::P500;
use actix_web::{HttpResponse, ResponseError};
use std::fmt;
#[derive(Debug)]
pub(crate) enum Error {
@ -9,8 +11,9 @@ pub(crate) enum Error {
Serial(serde_json::Error),
}
impl std::fmt::Display for Error {
fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
impl fmt::Display for Error {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
// write!(fmt, "{}", P500)
match self {
Error::Badge(s) => write!(fmt, "Badge({})", s),
Error::Git(e) => write!(fmt, "Git({})", e),
@ -23,7 +26,9 @@ impl std::fmt::Display for Error {
impl ResponseError for Error {
fn error_response(&self) -> HttpResponse {
HttpResponse::InternalServerError().finish()
HttpResponse::InternalServerError()
.content_type("text/html")
.body(P500)
}
}

19
src/main.rs
View File

@ -35,6 +35,8 @@ struct State {
}
const INDEX: &str = include_str!("../static/index.html");
const P404: &str = include_str!("../static/404.html");
const P500: &str = include_str!("../static/500.html");
const CSS: &str = include_str!("../static/tacit-css.min.css");
#[derive(StructOpt, Debug)]
@ -194,22 +196,18 @@ fn overview(_: web::Path<(String, String)>) -> HttpResponse {
#[get("/")]
fn index() -> HttpResponse {
let (tx, rx_body) = mpsc::unbounded();
let _ = tx.unbounded_send(Bytes::from(INDEX.as_bytes()));
HttpResponse::Ok().content_type("text/html").body(INDEX)
}
HttpResponse::Ok()
fn p404() -> HttpResponse {
HttpResponse::NotFound()
.content_type("text/html")
.streaming(rx_body.map_err(|_| ErrorBadRequest("bad request")))
.body(P404)
}
#[get("/tacit-css.min.css")]
fn css() -> HttpResponse {
let (tx, rx_body) = mpsc::unbounded();
let _ = tx.unbounded_send(Bytes::from(CSS.as_bytes()));
HttpResponse::Ok()
.content_type("text/css")
.streaming(rx_body.map_err(|_| ErrorBadRequest("bad request")))
HttpResponse::Ok().content_type("text/css").body(CSS)
}
fn main() -> std::io::Result<()> {
@ -234,6 +232,7 @@ fn main() -> std::io::Result<()> {
.service(web::resource("/view/github/{user}/{repo}").to(overview))
.service(web::resource("/view/gitlab/{user}/{repo}").to(overview))
.service(web::resource("/view/github/{user}/{repo}").to(overview))
.default_service(web::resource("").route(web::get().to(p404)))
})
.bind(interface)?
.run()