david/contextswitch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor modules

Browse Source
This commit is contained in:
David Rousselie
2022-01-17 19:54:49 +01:00
parent 5c6471aea9
commit a1d12152b4
11 changed files with 126 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/lib.rs
View File

@@ -1,10 +1,6 @@
use actix_web::{dev::Server, http, middleware, web, App, HttpResponse, HttpServer};
use contextswitch_types::TaskDefinition;
use actix_web::{dev::Server, http, middleware, web, App, HttpServer};
use listenfd::ListenFd;
use serde::Deserialize;
use serde_json::json;
use std::env;
use std::io::Error;
use std::net::TcpListener;
use tracing_actix_web::TracingLogger;
@@ -13,42 +9,7 @@ extern crate lazy_static;
pub mod contextswitch;
pub mod observability;
pub mod taskwarrior;
#[derive(Deserialize)]
struct TaskQuery {
filter: Option<String>,
}
#[tracing::instrument(level = "debug", skip_all, fields(filter = %task_query.filter.as_ref().unwrap_or(&"".to_string())))]
async fn list_tasks(task_query: web::Query<TaskQuery>) -> Result<HttpResponse, Error> {
let filter = task_query
.filter
.as_ref()
.map_or(vec![], |filter| filter.split(' ').collect());
let tasks = contextswitch::export(filter)?;
Ok(HttpResponse::Ok()
.content_type("application/json")
.body(serde_json::to_string(&tasks)?))
}
#[tracing::instrument(level = "debug", skip_all, fields(definition = %task_definition.definition))]
async fn add_task(task_definition: web::Json<TaskDefinition>) -> Result<HttpResponse, Error> {
let task_id = contextswitch::add(task_definition.definition.split(' ').collect()).await?;
Ok(HttpResponse::Ok()
.content_type("application/json")
.body(json!({ "id": task_id }).to_string()))
}
async fn option_task() -> HttpResponse {
HttpResponse::Ok().finish()
}
async fn health_check() -> HttpResponse {
HttpResponse::Ok().finish()
}
pub mod routes;
pub fn run(listener: TcpListener) -> Result<Server, std::io::Error> {
let cs_front_base_url =
@@ -66,10 +27,13 @@ pub fn run(listener: TcpListener) -> Result<Server, std::io::Error> {
))
.add(("Access-Control-Allow-Headers", "content-type".as_bytes())),
)
.route("/ping", web::get().to(health_check))
.route("/tasks", web::get().to(list_tasks))
.route("/tasks", web::post().to(add_task))
.route("/tasks", web::method(http::Method::OPTIONS).to(option_task))
.route("/ping", web::get().to(routes::ping))
.route("/tasks", web::get().to(routes::list_tasks))
.route("/tasks", web::post().to(routes::add_task))
.route(
"/tasks",
web::method(http::Method::OPTIONS).to(routes::option_task),
)
})
.keep_alive(60)
.shutdown_timeout(60);