aboutsummaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2021-04-08 15:01:13 +0200
committerAlex <alex@adnab.me>2021-04-08 15:01:13 +0200
commitc35c472dc9b04ed49e28a78bc9fa96baa7282502 (patch)
treecb7390fabc55b047b2d75a0af3f3db9ab9d247bc /src/web
parentc3bd672d58d32c8fc3b3225bfc2bfb5330ec726e (diff)
parent718ae005486baeed358d56cc7cd319fedd1e76eb (diff)
downloadgarage-c35c472dc9b04ed49e28a78bc9fa96baa7282502.tar.gz
garage-c35c472dc9b04ed49e28a78bc9fa96baa7282502.zip
Merge pull request 'add doc comments' (#53) from trinity-1686a/garage:doc-comments into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/53
Diffstat (limited to 'src/web')
-rw-r--r--src/web/error.rs11
-rw-r--r--src/web/lib.rs7
-rw-r--r--src/web/web_server.rs1
3 files changed, 15 insertions, 4 deletions
diff --git a/src/web/error.rs b/src/web/error.rs
index 14bc3b75..f6afbb42 100644
--- a/src/web/error.rs
+++ b/src/web/error.rs
@@ -3,30 +3,37 @@ use hyper::StatusCode;
use garage_util::error::Error as GarageError;
+/// Errors of this crate
#[derive(Debug, Error)]
pub enum Error {
+ /// An error received from the API crate
#[error(display = "API error: {}", _0)]
- ApiError(#[error(source)] garage_api::error::Error),
+ ApiError(#[error(source)] garage_api::Error),
// Category: internal error
+ /// Error internal to garage
#[error(display = "Internal error: {}", _0)]
InternalError(#[error(source)] GarageError),
+ /// The file does not exist
#[error(display = "Not found")]
NotFound,
- // Category: bad request
+ /// The request contained an invalid UTF-8 sequence in its path or in other parameters
#[error(display = "Invalid UTF-8: {}", _0)]
InvalidUTF8(#[error(source)] std::str::Utf8Error),
+ /// The client send a header with invalid value
#[error(display = "Invalid header value: {}", _0)]
InvalidHeader(#[error(source)] hyper::header::ToStrError),
+ /// The client sent a request without host, or with unsupported method
#[error(display = "Bad request: {}", _0)]
BadRequest(String),
}
impl Error {
+ /// Transform errors into http status code
pub fn http_status_code(&self) -> StatusCode {
match self {
Error::NotFound => StatusCode::NOT_FOUND,
diff --git a/src/web/lib.rs b/src/web/lib.rs
index f28937b9..c06492a3 100644
--- a/src/web/lib.rs
+++ b/src/web/lib.rs
@@ -1,6 +1,9 @@
+//! Crate for handling web serving of s3 bucket
#[macro_use]
extern crate log;
-pub mod error;
+mod error;
+pub use error::Error;
-pub mod web_server;
+mod web_server;
+pub use web_server::run_web_server;
diff --git a/src/web/web_server.rs b/src/web/web_server.rs
index cfde2bcc..9635eca6 100644
--- a/src/web/web_server.rs
+++ b/src/web/web_server.rs
@@ -18,6 +18,7 @@ use garage_model::garage::Garage;
use garage_table::*;
use garage_util::error::Error as GarageError;
+/// Run a web server
pub async fn run_web_server(
garage: Arc<Garage>,
shutdown_signal: impl Future<Output = ()>,