Browse Source

Rust axum fixes

Dragos Varovici 3 years ago
parent
commit
0c808262a7

+ 1 - 1
frameworks/Rust/axum/axum-mongo.dockerfile

@@ -3,7 +3,7 @@ FROM rust:1.55-slim-buster
 ENV AXUM_TECHEMPOWER_MONGODB_URL=mongodb://tfb-database:27017
 ENV AXUM_TECHEMPOWER_MONGODB_URL=mongodb://tfb-database:27017
 
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    libpq-dev pkg-config libssl-dev \
+    pkg-config libssl-dev \
     && rm -rf /var/lib/apt/lists/*
     && rm -rf /var/lib/apt/lists/*
 
 
 WORKDIR /axum
 WORKDIR /axum

+ 1 - 1
frameworks/Rust/axum/axum.dockerfile

@@ -1,7 +1,7 @@
 FROM rust:1.55-slim-buster
 FROM rust:1.55-slim-buster
 
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    libpq-dev pkg-config libssl-dev \
+    pkg-config libssl-dev \
     && rm -rf /var/lib/apt/lists/*
     && rm -rf /var/lib/apt/lists/*
 
 
 WORKDIR /axum
 WORKDIR /axum

+ 3 - 7
frameworks/Rust/axum/benchmark_config.json

@@ -5,18 +5,14 @@
       "default": {
       "default": {
         "json_url": "/json",
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "plaintext_url": "/plaintext",
-        "db_url": "/db",
-        "fortune_url": "/fortunes",
-        "query_url": "/queries?queries=",
-        "update_url": "/updates?queries=",
         "port": 8000,
         "port": 8000,
         "approach": "Realistic",
         "approach": "Realistic",
-        "classification": "Fullstack",
-        "database": "postgres",
+        "classification": "Platform",
+        "database": "none",
         "framework": "Axum",
         "framework": "Axum",
         "language": "Rust",
         "language": "Rust",
         "flavor": "None",
         "flavor": "None",
-        "orm": "Full",
+        "orm": "Raw",
         "platform": "Rust",
         "platform": "Rust",
         "webserver": "Hyper",
         "webserver": "Hyper",
         "os": "Linux",
         "os": "Linux",

+ 5 - 9
frameworks/Rust/axum/src/main.rs

@@ -22,17 +22,13 @@ async fn main() {
 
 
     let addr = SocketAddr::from((Ipv4Addr::UNSPECIFIED, 8000));
     let addr = SocketAddr::from((Ipv4Addr::UNSPECIFIED, 8000));
 
 
-    let app = router().await;
+    let app =  Router::new()
+        .route("/plaintext", get(plaintext))
+        .route("/json", get(json))
+        .layer(SetResponseHeaderLayer::<_, Body>::if_not_present(header::SERVER, HeaderValue::from_static("Axum")));
 
 
     axum::Server::bind(&addr)
     axum::Server::bind(&addr)
         .serve(app.into_make_service())
         .serve(app.into_make_service())
         .await
         .await
         .unwrap();
         .unwrap();
-}
-
-async fn router() -> Router {
-    Router::new()
-        .route("/plaintext", get(plaintext))
-        .route("/json", get(json))
-        .layer(SetResponseHeaderLayer::<_, Body>::if_not_present(header::SERVER, HeaderValue::from_static("Axum")))
-}
+}