Added configuration file and loggign.
This commit is contained in:
+25
-3
@@ -14,16 +14,38 @@ async fn main() -> std::io::Result<()> {
|
||||
use sqlx::migrate;
|
||||
use sqlx::postgres::PgPoolOptions;
|
||||
use rezervator::backend::auth_middleware::Authentication;
|
||||
use rezervator::config::load_config;
|
||||
use env_logger::Env;
|
||||
use std::env::args;
|
||||
use getopts::Options;
|
||||
use log::info;
|
||||
|
||||
let args: Vec<String> = args().collect();
|
||||
let mut opts = Options::new();
|
||||
opts.optopt("c", "config", "Path to config file. Default is ./config.toml", "");
|
||||
opts.optflag("h", "help", "Show help");
|
||||
let matches = opts.parse(&args[1..]).expect("Can't parse commandline");
|
||||
|
||||
if matches.opt_present("h") {
|
||||
println!("{}",opts.usage(format!("Usage: {} [options]",
|
||||
args.get(0).unwrap_or(&"".to_string())).as_str()));
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let cfg_path = matches.opt_str("c").unwrap_or("config.toml".to_string());
|
||||
|
||||
env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
|
||||
info!("Starting server");
|
||||
|
||||
let conf = get_configuration(None).await.unwrap();
|
||||
let addr = conf.leptos_options.site_addr;
|
||||
let srv_conf = load_config(&cfg_path);
|
||||
// Generate the list of routes in your Leptos App
|
||||
let routes = generate_route_list(|| view! { <App/> });
|
||||
let key = Key::generate();
|
||||
|
||||
let pool = PgPoolOptions::new()
|
||||
.max_connections(10)
|
||||
.connect("postgres://pepa:mkoijn@localhost/rezervator").await.unwrap();
|
||||
.connect(&srv_conf.database().con_string()).await.unwrap();
|
||||
|
||||
migrate!().run(&pool).await.expect("could not run SQLx migrations");
|
||||
|
||||
@@ -47,7 +69,7 @@ async fn main() -> std::io::Result<()> {
|
||||
.service(Files::new("/", site_root))
|
||||
//.wrap(middleware::Compress::default())
|
||||
})
|
||||
.bind(&addr)?
|
||||
.bind(srv_conf.network().bind_address())?
|
||||
.run()
|
||||
.await
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user