projects
/
recipes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update dependencies (actix-web 2)
[recipes.git]
/
backend
/
src
/
main.rs
diff --git
a/backend/src/main.rs
b/backend/src/main.rs
index
fcb8e12
..
299f5c5
100644
(file)
--- a/
backend/src/main.rs
+++ b/
backend/src/main.rs
@@
-1,16
+1,14
@@
-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::{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 ron::de::from_reader;
use serde::Deserialize;
-use
std::{fs::File, env::args}
;
+use
env_logger
;
use itertools::Itertools;
use itertools::Itertools;
@@
-28,12
+26,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 ***
" };
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)]
@@
-47,7
+45,8
@@
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(()) }
println!("Starting RUP as web server...");
if process_args() { return Ok(()) }
println!("Starting RUP as web server...");
@@
-62,7
+61,10
@@
fn main() -> std::io::Result<()> {
println!("Configuration: {:?}", config);
println!("Configuration: {:?}", config);
- let database_connection = db::create_or_update();
+ // 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 =
let mut listenfd = ListenFd::from_env();
let mut server =
@@
-70,7
+72,8
@@
fn main() -> std::io::Result<()> {
|| {
App::new()
.wrap(middleware::Compress::default())
|| {
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())
}
@@
-83,7
+86,7
@@
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 process_args() -> bool {
@@
-98,7
+101,8
@@
fn process_args() -> bool {
print_usage();
return true
} else if args.iter().any(|arg| arg == "--test") {
print_usage();
return true
} else if args.iter().any(|arg| arg == "--test") {
- let database_connection = db::create_or_update();
+ let db_connection = db::Connection::new();
+ db_connection.create_or_update();
return true
}
return true
}