-extern crate actix_web;
-extern crate listenfd;
-extern crate askama;
+use std::io::prelude::*;
+use std::{fs::File, env::args};
-use listenfd::ListenFd;
use actix_files as fs;
-use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query};
-use askama::Template;
+use actix_web::{get, web, Responder, middleware, App, HttpServer, HttpResponse, web::Query, middleware::Logger};
-use std::io::prelude::*;
+use askama::Template;
+use listenfd::ListenFd;
use ron::de::from_reader;
use serde::Deserialize;
-use std::{fs::File, env::args};
+use env_logger;
use itertools::Itertools;
mod consts;
+mod db;
#[derive(Template)]
#[template(path = "main.html")]
m: Option<String>
}
-fn main_page(query: Query<Request>) -> Result<HttpResponse> {
+fn main_page(query: Query<Request>) -> HttpResponse {
- let main_template = MainTemplate { test: &"test" };
+ let main_template = MainTemplate { test: &"*** test ***" };
let s = main_template.render().unwrap();
- Ok(HttpResponse::Ok().content_type("text/html").body(s))
+ HttpResponse::Ok().content_type("text/html").body(s)
}
#[derive(Debug, Deserialize)]
first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
}
-fn main() -> std::io::Result<()> {
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
if process_args() { return Ok(()) }
println!("Starting RUP as web server...");
println!("Configuration: {:?}", config);
+ // let database_connection = db::create_or_update();
+
+ std::env::set_var("RUST_LOG", "actix_web=info");
+ env_logger::init();
+
let mut listenfd = ListenFd::from_env();
let mut server =
HttpServer::new(
|| {
App::new()
.wrap(middleware::Compress::default())
- .wrap(middleware::Logger::default())
+ .wrap(Logger::default())
+ .wrap(Logger::new("%a %{User-Agent}i"))
.service(web::resource("/").to(main_page))
.service(fs::Files::new("/static", "static").show_files_listing())
}
server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
};
- server.run()
+ server.run().await
}
fn process_args() -> bool {
fn print_usage() {
println!("Usage:");
- println!(" {} [--help]", get_exe_name());
+ println!(" {} [--help] [--test]", get_exe_name());
}
let args: Vec<String> = args().collect();
if args.iter().any(|arg| arg == "--help") {
print_usage();
return true
+ } else if args.iter().any(|arg| arg == "--test") {
+ let db_connection = db::Connection::new();
+ db_connection.create_or_update();
+ return true
}
false