aboutsummaryrefslogtreecommitdiff
path: root/src/web/web_server.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/web/web_server.rs')
-rw-r--r--src/web/web_server.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/web/web_server.rs b/src/web/web_server.rs
index 3cc0fa43..4771d209 100644
--- a/src/web/web_server.rs
+++ b/src/web/web_server.rs
@@ -11,12 +11,13 @@ use hyper::service::{make_service_fn, service_fn};
use hyper::{Body, Request, Response, Server};
use garage_model::garage::Garage;
-use garage_util::error::Error;
+use garage_util::error::Error as GarageError;
+use crate::error::*;
pub async fn run_web_server(
garage: Arc<Garage>,
shutdown_signal: impl Future<Output = ()>,
-) -> Result<(), Error> {
+) -> Result<(), GarageError> {
let addr = &garage.config.s3_web.bind_addr;
let service = make_service_fn(|conn: &AddrStream| {