gburri/recipes
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Remove the logger (for the moment) and update the deployment script.

Browse source
This commit is contained in:
Greg Burri 2020-05-12 00:10:42 +02:00
parent d83b56c642
commit dcf7523ccf
5 changed files with 258 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/Cargo.toml
View file

@ -13,10 +13,9 @@ serde = { version = "1.0", features = ["derive"] }
listenfd = "0.3" # To watch file modifications and automatically launch a build process (only used in dev/debug).
ron = "0.5" # Rust object notation, to load configuration files.
itertools = "0.9"
env_logger = "0.7"
common = { path = "../common" }
[dependencies.rusqlite]
version = "0.22"
features = ["bundled"]
version = "0.23"
features = ["bundled"]

8
backend/src/main.rs
View file

@ -2,13 +2,12 @@ use std::io::prelude::*;
use std::{fs::File, env::args};
use actix_files as fs;
use actix_web::{get, web, Responder, middleware, App, HttpServer, HttpResponse, 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 env_logger;
use itertools::Itertools;
@ -28,7 +27,7 @@ pub struct Request {
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();
HttpResponse::Ok().content_type("text/html").body(s)
@ -64,7 +63,6 @@ async fn main() -> std::io::Result<()> {
// 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 =
@ -72,8 +70,6 @@ async fn main() -> std::io::Result<()> {
|| {
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())
}