LibreCloud/lib_defs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: fix APP_HOME with '.' as default

Browse Source
This commit is contained in:
Jesús Pérez Lorenzo 2021-09-08 20:48:33 +01:00
parent 6aea11cde4
commit 4998414e68
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_env/src/appinfo.rs
View File

@ -31,7 +31,7 @@ impl AppInfo {
} }
} }
pub fn load_data(&self,app_env: &AppEnv) -> Self { pub fn load_data(&self,app_env: &AppEnv) -> Self {
let usedata = match std::fs::read_to_string(format!("{}/{}/.use",&envmnt::get_or("APP_HOME", ""),app_env.get_curr_websrvr_config().home_path)) { let usedata = match std::fs::read_to_string(format!("{}/{}/.use",&envmnt::get_or("APP_HOME", "."),app_env.get_curr_websrvr_config().home_path)) {
Ok(res) => res, Ok(res) => res,
// Err(e) => { println!("Error usedata: {}",e); String::from("")}, // Err(e) => { println!("Error usedata: {}",e); String::from("")},
Err(_) => String::from(""), Err(_) => String::from(""),

2
app_env/src/config.rs
View File

@ -171,7 +171,7 @@ impl Config {
if verbose != "quiet" { if verbose != "quiet" {
println!("Config Loaded successfully"); println!("Config Loaded successfully");
} }
let app_home=envmnt::get_or("APP_HOME", ""); let app_home=envmnt::get_or("APP_HOME", ".");
// if app_home.is_empty() { // if app_home.is_empty() {
// cfg // cfg
// } else { // } else {

2
kloud/src/utils.rs
View File

@ -12,7 +12,7 @@ pub fn load_from_module(env: AppEnv, coll_key: &str) -> (String,String) {
if let Some(module) = env.modules.get(coll_key) { if let Some(module) = env.modules.get(coll_key) {
match module.stores.to_owned().as_str() { match module.stores.to_owned().as_str() {
"file" => { "file" => {
let store_root =format!("{}/{}/{}",&envmnt::get_or("APP_HOME", ""),&env.get_curr_websrvr_config().home_path,&module.store_root); let store_root =format!("{}/{}/{}",&envmnt::get_or("APP_HOME", "."),&env.get_curr_websrvr_config().home_path,&module.store_root);
(module.store_frmt.to_owned(), load_fs_content(&store_root, &module.store_path, &module.store_frmt)) (module.store_frmt.to_owned(), load_fs_content(&store_root, &module.store_path, &module.store_frmt))
}, },
_ => { _ => {