summaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/main.rs b/src/main.rs
index 590d714..4a02f95 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,14 +2,14 @@ use axum::{
error_handling::HandleErrorLayer,
http::StatusCode,
response::IntoResponse,
- routing::{get, post, delete},
- Json, Router, Extension
+ routing::{delete, get, post},
+ Extension, Json, Router,
};
use errors::ServiceError;
use serde::{Deserialize, Serialize};
-use sqlx::{Connection, query, PgConnection, PgPool, postgres::PgPoolOptions};
-use std::{net::SocketAddr, time::Duration, str::FromStr, sync::Arc};
+use sqlx::{postgres::PgPoolOptions, query, Connection, PgConnection, PgPool};
+use std::{net::SocketAddr, str::FromStr, sync::Arc, time::Duration};
use tower::{BoxError, ServiceBuilder};
use tower_http::trace::TraceLayer;
@@ -28,33 +28,34 @@ pub struct State {
async fn main() {
kankyo::init().unwrap();
color_eyre::install().unwrap();
- tracing_subscriber::registry()
+ tracing_subscriber::registry()
.with(tracing_subscriber::EnvFilter::new(
- std::env::var("RUST_LOG")
- .unwrap_or_else(|_| "homeworld=info,tower_http=debug".into()),
+ std::env::var("RUST_LOG").unwrap_or_else(|_| "homeworld=info,tower_http=debug".into()),
))
.with(tracing_subscriber::fmt::layer())
.init();
let mut conn = PgPoolOptions::new()
.max_connections(5)
- .connect(&std::env::var("DATABASE_URL").unwrap_or("postgres://postgres@localhost/homeworld".to_string())).await.unwrap();
-
- sqlx::migrate!("./migrations")
- .run(&conn)
- .await.unwrap();
+ .connect(
+ &std::env::var("DATABASE_URL")
+ .unwrap_or("postgres://postgres@localhost/homeworld".to_string()),
+ )
+ .await
+ .unwrap();
- let shared_state = Arc::new(State {
- conn
- });
+ sqlx::migrate!("./migrations").run(&conn).await.unwrap();
+
+ let shared_state = Arc::new(State { conn });
let app = Router::new()
.route("/health", get(health_check))
.route("/ships/list", get(handlers::ships::list))
- .route("/ships/new", post(handlers::ships::new))
+ .route("/ships/new", post(handlers::ships::new))
.route("/ships/delete/:shasum", delete(handlers::ships::delete))
.route("/ships/get/:shasum", get(handlers::ships::get))
- .layer( ServiceBuilder::new()
+ .layer(
+ ServiceBuilder::new()
.layer(HandleErrorLayer::new(|error: BoxError| async move {
if error.is::<tower::timeout::error::Elapsed>() {
Ok(StatusCode::REQUEST_TIMEOUT)
@@ -83,4 +84,3 @@ async fn main() {
async fn health_check() -> &'static str {
"OK"
}
-