Refactor project into workspaces
This commit is contained in:
		
							parent
							
								
									131bdeec78
								
							
						
					
					
						commit
						bacea1e3e9
					
				
					 31 changed files with 119 additions and 99 deletions
				
			
		
							
								
								
									
										26
									
								
								emgauwa-core/Cargo.toml
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								emgauwa-core/Cargo.toml
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,26 @@
 | 
			
		|||
[package]
 | 
			
		||||
name = "emgauwa-core"
 | 
			
		||||
version = "0.1.0"
 | 
			
		||||
edition = "2021"
 | 
			
		||||
authors = ["Tobias Reisinger <tobias@msrg.cc>"]
 | 
			
		||||
 | 
			
		||||
[dependencies]
 | 
			
		||||
emgauwa-lib = { path = "../emgauwa-lib" }
 | 
			
		||||
 | 
			
		||||
actix = "0.13"
 | 
			
		||||
actix-web = "4.4"
 | 
			
		||||
actix-web-actors = "4.2"
 | 
			
		||||
 | 
			
		||||
config = "0.13"
 | 
			
		||||
 | 
			
		||||
simple_logger = "4.2"
 | 
			
		||||
log = "0.4"
 | 
			
		||||
 | 
			
		||||
chrono = { version = "0.4", features = ["serde"] }
 | 
			
		||||
uuid = { version = "1.5", features = ["serde", "v4"] }
 | 
			
		||||
 | 
			
		||||
serde = "1.0"
 | 
			
		||||
serde_json = "1.0"
 | 
			
		||||
serde_derive = "1.0"
 | 
			
		||||
 | 
			
		||||
futures = "0.3.29"
 | 
			
		||||
							
								
								
									
										3
									
								
								emgauwa-core/build.rs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								emgauwa-core/build.rs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
fn main() {
 | 
			
		||||
	println!("cargo:rustc-env=DATABASE_URL=sqlite://emgauwa-core.sqlite")
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										50
									
								
								emgauwa-core/src/main.rs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								emgauwa-core/src/main.rs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,50 @@
 | 
			
		|||
use std::str::FromStr;
 | 
			
		||||
 | 
			
		||||
use actix_web::middleware::TrailingSlash;
 | 
			
		||||
use actix_web::{middleware, web, App, HttpServer};
 | 
			
		||||
use emgauwa_lib::handlers;
 | 
			
		||||
use log::{trace, LevelFilter};
 | 
			
		||||
use simple_logger::SimpleLogger;
 | 
			
		||||
 | 
			
		||||
mod settings;
 | 
			
		||||
 | 
			
		||||
#[actix_web::main]
 | 
			
		||||
async fn main() -> std::io::Result<()> {
 | 
			
		||||
	let settings = settings::init();
 | 
			
		||||
 | 
			
		||||
	let log_level: LevelFilter = log::LevelFilter::from_str(&settings.logging.level)
 | 
			
		||||
		.unwrap_or_else(|_| panic!("Error parsing log level."));
 | 
			
		||||
	trace!("Log level set to {:?}", log_level);
 | 
			
		||||
 | 
			
		||||
	SimpleLogger::new()
 | 
			
		||||
		.with_level(log_level)
 | 
			
		||||
		.init()
 | 
			
		||||
		.unwrap_or_else(|_| panic!("Error initializing logger."));
 | 
			
		||||
 | 
			
		||||
	let pool = emgauwa_lib::db::init(&settings.database).await;
 | 
			
		||||
 | 
			
		||||
	HttpServer::new(move || {
 | 
			
		||||
		App::new()
 | 
			
		||||
			.wrap(
 | 
			
		||||
				middleware::DefaultHeaders::new()
 | 
			
		||||
					.add(("Access-Control-Allow-Origin", "*"))
 | 
			
		||||
					.add(("Access-Control-Allow-Headers", "*"))
 | 
			
		||||
					.add(("Access-Control-Allow-Methods", "*")),
 | 
			
		||||
			)
 | 
			
		||||
			.wrap(middleware::Logger::default())
 | 
			
		||||
			.wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
 | 
			
		||||
			.app_data(web::JsonConfig::default().error_handler(handlers::json_error_handler))
 | 
			
		||||
			.app_data(web::Data::new(pool.clone()))
 | 
			
		||||
			.service(handlers::v1::schedules::index)
 | 
			
		||||
			.service(handlers::v1::schedules::tagged)
 | 
			
		||||
			.service(handlers::v1::schedules::show)
 | 
			
		||||
			.service(handlers::v1::schedules::add)
 | 
			
		||||
			.service(handlers::v1::schedules::add_list)
 | 
			
		||||
			.service(handlers::v1::schedules::update)
 | 
			
		||||
			.service(handlers::v1::schedules::delete)
 | 
			
		||||
			.service(handlers::v1::ws::controllers::index)
 | 
			
		||||
	})
 | 
			
		||||
	.bind(format!("{}:{}", settings.host, settings.port))?
 | 
			
		||||
	.run()
 | 
			
		||||
	.await
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										54
									
								
								emgauwa-core/src/settings.rs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								emgauwa-core/src/settings.rs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,54 @@
 | 
			
		|||
use config::Config;
 | 
			
		||||
use serde_derive::Deserialize;
 | 
			
		||||
 | 
			
		||||
#[derive(Clone, Debug, Deserialize)]
 | 
			
		||||
#[serde(default)]
 | 
			
		||||
#[allow(unused)]
 | 
			
		||||
pub struct Logging {
 | 
			
		||||
	pub level: String,
 | 
			
		||||
	pub file: String,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Clone, Debug, Deserialize)]
 | 
			
		||||
#[serde(default)]
 | 
			
		||||
#[allow(unused)]
 | 
			
		||||
pub struct Settings {
 | 
			
		||||
	pub database: String,
 | 
			
		||||
	pub port: u16,
 | 
			
		||||
	pub host: String,
 | 
			
		||||
	pub logging: Logging,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Default for Settings {
 | 
			
		||||
	fn default() -> Self {
 | 
			
		||||
		Settings {
 | 
			
		||||
			database: String::from("sqlite://emgauwa-core.sqlite"),
 | 
			
		||||
			port: 5000,
 | 
			
		||||
			host: String::from("127.0.0.1"),
 | 
			
		||||
			logging: Logging::default(),
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Default for Logging {
 | 
			
		||||
	fn default() -> Self {
 | 
			
		||||
		Logging {
 | 
			
		||||
			level: String::from("info"),
 | 
			
		||||
			file: String::from("stdout"),
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn init() -> Settings {
 | 
			
		||||
	Config::builder()
 | 
			
		||||
		.add_source(config::File::with_name("emgauwa-core"))
 | 
			
		||||
		.add_source(
 | 
			
		||||
			config::Environment::with_prefix("EMGAUWA")
 | 
			
		||||
				.prefix_separator("_")
 | 
			
		||||
				.separator("__"),
 | 
			
		||||
		)
 | 
			
		||||
		.build()
 | 
			
		||||
		.unwrap()
 | 
			
		||||
		.try_deserialize::<Settings>()
 | 
			
		||||
		.unwrap_or_else(|_| panic!("Error reading settings."))
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue