same functionality now works with axum the same way it did with actix
This commit is contained in:
22
src/main.rs
22
src/main.rs
@@ -10,7 +10,7 @@ use utoipa::OpenApi;
|
||||
use utoipa_axum::router::OpenApiRouter;
|
||||
use utoipa_swagger_ui::SwaggerUi;
|
||||
|
||||
use crate::{ringer::BeepRinger, scheduler::Scheduler};
|
||||
use crate::{ringer::{BeepRinger, SilentRinger}, scheduler::Scheduler};
|
||||
|
||||
mod scheduler;
|
||||
mod ringer;
|
||||
@@ -22,16 +22,17 @@ mod model;
|
||||
|
||||
#[derive(Clone)]
|
||||
struct AppState {
|
||||
scheduler: Arc<Scheduler<BeepRinger>>
|
||||
scheduler: Arc<Scheduler<SilentRinger>>
|
||||
}
|
||||
|
||||
async fn app_state() -> AppState {
|
||||
let chip: Arc<Mutex<Chip>> = Arc::new(Mutex::new(Chip::new("/dev/gpiochip0").unwrap()));
|
||||
// let chip: Arc<Mutex<Chip>> = Arc::new(Mutex::new(Chip::new("/dev/gpiochip0").unwrap()));
|
||||
let cron = Arc::new(Mutex::new(Cron::new(chrono::Local)));
|
||||
let db = Database::connect("sqlite://snooze-pal.db").await.unwrap();
|
||||
let silent = Arc::new(Mutex::new(SilentRinger::new()));
|
||||
AppState {
|
||||
scheduler: Arc::new(Scheduler::new(
|
||||
Arc::new(Mutex::new(BeepRinger::new(chip.clone()))),
|
||||
silent,
|
||||
cron.clone(),
|
||||
Arc::new(db)
|
||||
))
|
||||
@@ -40,11 +41,9 @@ async fn app_state() -> AppState {
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
// let app_state = app_state().await;
|
||||
|
||||
// app_state.scheduler.start();
|
||||
|
||||
start_axum_server().await;
|
||||
let app_state = app_state().await;
|
||||
app_state.scheduler.start();
|
||||
start_axum_server(app_state).await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -52,11 +51,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
#[derive(OpenApi)]
|
||||
struct ApiDocs;
|
||||
|
||||
async fn start_axum_server() {
|
||||
async fn start_axum_server(app_state: AppState) {
|
||||
let docs = ApiDocs::openapi();
|
||||
|
||||
let (router, spec) = OpenApiRouter::with_openapi(docs)
|
||||
let (router, spec) = OpenApiRouter::<AppState>::with_openapi(docs)
|
||||
.nest("/v1", resources::router())
|
||||
.with_state(app_state)
|
||||
.split_for_parts();
|
||||
|
||||
let router = router.merge(SwaggerUi::new("/swagger-ui").url("/openapi.json", spec));
|
||||
|
||||
Reference in New Issue
Block a user