projects
/
recipes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the logger (for the moment) and update the deployment script.
[recipes.git]
/
backend
/
src
/
main.rs
diff --git
a/backend/src/main.rs
b/backend/src/main.rs
index
0536428
..
c043f7a
100644
(file)
--- a/
backend/src/main.rs
+++ b/
backend/src/main.rs
@@
-2,17
+2,17
@@
use std::io::prelude::*;
use std::{fs::File, env::args};
use actix_files as fs;
use std::{fs::File, env::args};
use actix_files as fs;
-use actix_web::{
web, middleware, App, HttpServer, HttpResponse, Result, web::Query, middleware::Logger
};
+use actix_web::{
get, web, Responder, middleware, App, HttpServer, HttpResponse, web::Query
};
use askama::Template;
use listenfd::ListenFd;
use ron::de::from_reader;
use serde::Deserialize;
use askama::Template;
use listenfd::ListenFd;
use ron::de::from_reader;
use serde::Deserialize;
-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")]
@@
-25,12
+25,12
@@
pub struct Request {
m: Option<String>
}
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 2 ***
" };
let s = main_template.render().unwrap();
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)]
}
#[derive(Debug, Deserialize)]
@@
-44,10
+44,11
@@
fn get_exe_name() -> String {
first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
}
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(()) }
if process_args() { return Ok(()) }
- println!("Starting R
UP
as web server...");
+ println!("Starting R
ecipes
as web server...");
let config: Config = {
let f = File::open(consts::FILE_CONF).unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF));
let config: Config = {
let f = File::open(consts::FILE_CONF).unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF));
@@
-59,8
+60,9
@@
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");
std::env::set_var("RUST_LOG", "actix_web=info");
- env_logger::init();
let mut listenfd = ListenFd::from_env();
let mut server =
let mut listenfd = ListenFd::from_env();
let mut server =
@@
-68,8
+70,6
@@
fn main() -> std::io::Result<()> {
|| {
App::new()
.wrap(middleware::Compress::default())
|| {
App::new()
.wrap(middleware::Compress::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())
}
@@
-82,13
+82,13
@@
fn main() -> std::io::Result<()> {
server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
};
server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
};
- server.run()
+ server.run()
.await
}
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();
@@
-96,6
+96,10
@@
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 db_connection = db::Connection::new();
+ db_connection.create_or_update();
+ return true
}
false
}
false