Deuxfleurs/garage
45
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Skeleton to the new web API

Browse source
This commit is contained in:
Quentin 2020-11-02 15:48:39 +01:00
parent 104e2ce0a2
commit cea871d944
7 changed files with 823 additions and 706 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1435
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

1
Cargo.toml
View file

@ -5,6 +5,7 @@ members = [
"src/table",
"src/model",
"src/api",
"src/web",
"src/garage",
]

6
src/garage/server.rs
View file

@ -9,6 +9,7 @@ use garage_util::config::*;
use garage_util::error::Error;
use garage_api::api_server;
use garage_web::web_server;
use garage_model::garage::Garage;
use garage_rpc::rpc_server::RpcServer;
@ -56,6 +57,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
info!("Initializing RPC and API servers...");
let run_rpc_server = Arc::new(rpc_server).run(wait_from(watch_cancel.clone()));
let api_server = api_server::run_api_server(garage.clone(), wait_from(watch_cancel.clone()));
let web_server = web_server::run_web_server(garage.clone(), wait_from(watch_cancel.clone()));
futures::try_join!(
garage
@ -78,6 +80,10 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
info!("API server exited");
rv
}),
web_server.map(|rv| {
info!("Web server exited");
rv
}),
background.run().map(|rv| {
info!("Background runner exited");
Ok(rv)

2
src/util/config.rs
View file

@ -54,7 +54,7 @@ pub struct ApiConfig {
#[derive(Deserialize, Debug, Clone)]
pub struct WebConfig {
pub website_bind_addr: SocketAddr,
pub web_bind_addr: SocketAddr,
}
fn default_max_concurrent_rpc_requests() -> usize {

43
src/web/Cargo.toml Normal file
View file

@ -0,0 +1,43 @@
[package]
name = "garage_web"
version = "0.1.0"
authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"]
edition = "2018"
license = "GPL-3.0"
description = "Utility crate for the Garage object store"
repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage"
[lib]
path = "lib.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
garage_util = { version = "0.1", path = "../util" }
garage_table = { version = "0.1.1", path = "../table" }
garage_model = { version = "0.1.1", path = "../model" }
rand = "0.7"
hex = "0.3"
sha2 = "0.8"
err-derive = "0.2.3"
log = "0.4"
sled = "0.31"
toml = "0.5"
rmp-serde = "0.14.3"
serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
serde_json = "1.0"
futures = "0.3"
futures-util = "0.3"
tokio = { version = "0.2", default-features = false, features = ["rt-core", "rt-threaded", "io-driver", "net", "tcp", "time", "macros", "sync", "signal", "fs"] }
http = "0.2"
hyper = "0.13"
rustls = "0.17"
webpki = "0.21"
roxmltree = "0.11"

5
src/web/lib.rs Normal file
View file

@ -0,0 +1,5 @@
#[macro_use]
extern crate log;
pub mod web_server;

37
src/web/web_server.rs Normal file
View file

@ -0,0 +1,37 @@
use std::sync::Arc;
use futures::future::Future;
use hyper::server::conn::AddrStream;
use hyper::{Body,Request,Response,Server};
use hyper::service::{make_service_fn, service_fn};
use garage_util::error::Error;
use garage_model::garage::Garage;
pub async fn run_web_server(
garage: Arc<Garage>,
shutdown_signal: impl Future<Output = ()>,
) -> Result<(), Error> {
let addr = &garage.config.s3_web.web_bind_addr;
let service = make_service_fn(|conn: &AddrStream| {
let garage = garage.clone();
let client_addr = conn.remote_addr();
info!("{:?}", client_addr);
async move {
Ok::<_, Error>(service_fn(move |req: Request<Body>| {
let garage = garage.clone();
//handler(garage, req, client_addr)
async move { Ok::<Response<Body>, Error>(Response::new(Body::from("hello world\n"))) }
}))
}
});
let server = Server::bind(&addr).serve(service);
let graceful = server.with_graceful_shutdown(shutdown_signal);
info!("Web server listening on http://{}", addr);
graceful.await?;
Ok(())
}