projects
/
recipes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge
[recipes.git]
/
backend
/
src
/
main.rs
diff --git
a/backend/src/main.rs
b/backend/src/main.rs
index
bc89ab8
..
3063c63
100644
(file)
--- a/
backend/src/main.rs
+++ b/
backend/src/main.rs
@@
-1,20
+1,19
@@
-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_files as fs;
-use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query};
-use askama::Template;
+use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query, middleware::Logger};
-use std::io::prelude::*;
+use askama::Template;
+use listenfd::ListenFd;
use ron::de::from_reader;
use serde::Deserialize;
use ron::de::from_reader;
use serde::Deserialize;
-use
std::{fs::File, env::args}
;
+use
env_logger
;
use itertools::Itertools;
mod consts;
use itertools::Itertools;
mod consts;
+mod db;
#[derive(Template)]
#[template(path = "main.html")]
#[derive(Template)]
#[template(path = "main.html")]
@@
-61,13
+60,19
@@
fn main() -> std::io::Result<()> {
println!("Configuration: {:?}", config);
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())
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())
}
.service(web::resource("/").to(main_page))
.service(fs::Files::new("/static", "static").show_files_listing())
}
@@
-86,7
+91,7
@@
fn main() -> std::io::Result<()> {
fn process_args() -> bool {
fn print_usage() {
println!("Usage:");
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();
}
let args: Vec<String> = args().collect();
@@
-94,6
+99,9
@@
fn process_args() -> bool {
if args.iter().any(|arg| arg == "--help") {
print_usage();
return true
if args.iter().any(|arg| arg == "--help") {
print_usage();
return true
+ } else if args.iter().any(|arg| arg == "--test") {
+ let database_connection = db::create_or_update();
+ return true
}
false
}
false