david/contextswitch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Docker build

Browse Source
This commit is contained in:
David Rousselie
2022-03-27 20:08:12 +02:00
parent c746325495
commit a99af2f845
16 changed files with 198 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/configuration.rs
View File

@@ -12,6 +12,10 @@ pub struct Settings {
pub struct ApplicationSettings {
pub port: u16,
pub log_directive: String,
pub front_base_url: String,
pub api_path: String,
pub static_path: Option<String>,
pub static_dir: Option<String>,
}
#[derive(Deserialize)]
@@ -23,13 +27,21 @@ pub struct TaskwarriorSettings {
impl Settings {
pub fn new_from_file(file: Option<String>) -> Result<Self, ConfigError> {
let config_file_required = file.is_some();
let config_file =
file.unwrap_or_else(|| env::var("CONFIG").unwrap_or_else(|_| "dev".into()));
let config_path = env::var("CONFIG_PATH").unwrap_or_else(|_| "config".into());
let config_file = file.unwrap_or_else(|| {
env::var("CONFIG_FILE").unwrap_or_else(|_| format!("{}/dev", &config_path).into())
});
let default_config_file = format!("{}/default", config_path);
let local_config_file = format!("{}/local", config_path);
println!(
"Trying to load {:?} config files",
vec![&default_config_file, &local_config_file, &config_file]
);
let config = Config::builder()
.add_source(File::with_name(&format!("{}/default", config_path)))
.add_source(File::with_name(&format!("{}/local", config_path)).required(false))
.add_source(File::with_name(&default_config_file))
.add_source(File::with_name(&local_config_file).required(false))
.add_source(File::with_name(&config_file).required(config_file_required))
.add_source(Environment::with_prefix("cs"))
.build()?;