LibrePages/librepages
4
0
Fork 0
Code Issues 6 Pull requests 10 Projects Releases Packages Wiki Activity

feat: imple CLI to migrate and serve

Browse source
This commit is contained in:
Aravinth Manivannan 2022-09-10 19:29:37 +05:30
parent 6e38497bbb
commit 5df38a9b3f
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
1 changed files with 61 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/main.rs
View file

@ -21,9 +21,11 @@ use actix_web::{
error::InternalError, http::StatusCode, middleware as actix_middleware, web::Data as WebData, error::InternalError, http::StatusCode, middleware as actix_middleware, web::Data as WebData,
web::JsonConfig, App, HttpServer, web::JsonConfig, App, HttpServer,
}; };
use clap::{Parser, SubCommand, Subcommand};
use log::info; use log::info;
mod ctx; mod ctx;
mod db;
mod deploy; mod deploy;
mod errors; mod errors;
mod git; mod git;
@ -36,6 +38,7 @@ mod settings;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
use ctx::Ctx;
pub use routes::ROUTES as V1_API_ROUTES; pub use routes::ROUTES as V1_API_ROUTES;
pub use settings::Settings; pub use settings::Settings;
@ -47,30 +50,76 @@ pub const PKG_NAME: &str = env!("CARGO_PKG_NAME");
pub const PKG_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); pub const PKG_DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION");
pub const PKG_HOMEPAGE: &str = env!("CARGO_PKG_HOMEPAGE"); pub const PKG_HOMEPAGE: &str = env!("CARGO_PKG_HOMEPAGE");
pub type AppCtx = WebData<Arc<ctx::Ctx>>; pub type AppCtx = WebData<ctx::ArcCtx>;
//#[cfg(not(tarpaulin_include))]
//#[actix_web::main]
//async fn main() -> std::io::Result<()> {
// {
// const LOG_VAR: &str = "RUST_LOG";
// if env::var(LOG_VAR).is_err() {
// env::set_var("RUST_LOG", "info");
// }
// }
//
// let settings = Settings::new().unwrap();
// let ctx = WebData::new(ctx::Ctx::new(settings.clone()));
//
// pretty_env_logger::init();
//
// info!(
// "{}: {}.\nFor more information, see: {}\nBuild info:\nVersion: {} commit: {}",
// PKG_NAME, PKG_DESCRIPTION, PKG_HOMEPAGE, VERSION, GIT_COMMIT_HASH
// );
//
//
//}
#[derive(Parser)]
#[clap(author, version, about, long_about = None)]
struct Cli {
#[clap(subcommand)]
command: Commands,
}
#[derive(Subcommand)]
enum Commands {
/// run database migrations
Migrate,
/// run server
Serve,
}
#[cfg(not(tarpaulin_include))]
#[actix_web::main] #[actix_web::main]
#[cfg(not(tarpaulin_include))]
async fn main() -> std::io::Result<()> { async fn main() -> std::io::Result<()> {
{ env::set_var("RUST_LOG", "info");
const LOG_VAR: &str = "RUST_LOG";
if env::var(LOG_VAR).is_err() {
env::set_var("RUST_LOG", "info");
}
}
let settings = Settings::new().unwrap();
let ctx = WebData::new(ctx::Ctx::new(settings.clone()));
pretty_env_logger::init(); pretty_env_logger::init();
let cli = Cli::parse();
info!( info!(
"{}: {}.\nFor more information, see: {}\nBuild info:\nVersion: {} commit: {}", "{}: {}.\nFor more information, see: {}\nBuild info:\nVersion: {} commit: {}",
PKG_NAME, PKG_DESCRIPTION, PKG_HOMEPAGE, VERSION, GIT_COMMIT_HASH PKG_NAME, PKG_DESCRIPTION, PKG_HOMEPAGE, VERSION, GIT_COMMIT_HASH
); );
info!("Starting server on: http://{}", settings.server.get_ip()); let settings = Settings::new().unwrap();
let ctx = Ctx::new(settings.clone()).await;
let ctx = actix_web::web::Data::new(ctx);
match &cli.command {
Commands::Migrate => ctx.db.migrate().await.unwrap(),
Commands::Serve => serve(settings, ctx).await.unwrap(),
}
Ok(())
}
async fn serve(settings: Settings, ctx: AppCtx) -> std::io::Result<()> {
let ip = settings.server.get_ip();
info!("Starting server on: http://{}", settings.server.get_ip());
HttpServer::new(move || { HttpServer::new(move || {
App::new() App::new()
.wrap(actix_middleware::Logger::default()) .wrap(actix_middleware::Logger::default())