This commit is contained in:
2021-05-20 20:42:17 +02:00
parent 3ac416daa9
commit 89dba89b55
4 changed files with 10 additions and 16 deletions

View File

@ -1,7 +1,6 @@
use std::borrow::Borrow;
use std::fmt;
#[derive(Copy, Clone)]
#[derive(Copy, Clone, Debug)]
pub enum Kind {
InvalidEndpointError,
JsonParseError,
@ -11,12 +10,13 @@ pub enum Kind {
IoError,
}
#[derive(Copy, Clone)]
#[derive(Copy, Clone, Debug)]
pub enum Class {
ClientError,
ServerError,
}
#[derive(Debug)]
pub struct Error {
kind: Kind,
msg: Option<String>,
@ -89,12 +89,6 @@ impl fmt::Display for Error {
}
}
impl fmt::Debug for Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.fmt(f)
}
}
impl From<std::io::Error> for Error {
fn from(error: std::io::Error) -> Self {
Error {

View File

@ -113,7 +113,7 @@ fn endpoint_handler(
client.server_keep_alive = false;
}
client.stream.write_all(buf.as_bytes());
client.stream.write_all(buf.as_bytes()).unwrap();
};
let length = req.find_header("Content-Length");
@ -141,7 +141,7 @@ fn endpoint_handler(
};
let mut buf = [0; 8192];
client.stream.read_exact(&mut buf[..length]);
client.stream.read_exact(&mut buf[..length]).unwrap();
// TODO decompress
let input = match serde_json::from_slice(&buf[..length]) {
@ -160,6 +160,6 @@ fn endpoint_handler(
res.add_header("Content-Type", "application/json; charset=utf-8");
res.status(200);
res.send(&mut client.stream);
client.stream.write_all(buf.as_bytes());
res.send(&mut client.stream).unwrap();
client.stream.write_all(buf.as_bytes()).unwrap();
}

View File

@ -262,7 +262,7 @@ impl Response {
stream.write_all(header.as_bytes())?;
if let Some(buf) = buf {
stream.write_all(buf.as_bytes());
stream.write_all(buf.as_bytes())?;
}
Ok(())
}

View File

@ -8,11 +8,11 @@ pub fn connection_handler(client: &mut http::HttpStream, req: &http::Request) {
} else {
res.status(405);
res.add_header("Allow", "GET");
res.send(&mut client.stream);
res.send(&mut client.stream).unwrap();
return;
}
// TODO implement websocket
res.status(501);
res.send(&mut client.stream);
res.send(&mut client.stream).unwrap();
}