From ad0664c90b530f55339939a2d287ee0a2c49059c Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Fri, 17 Sep 2021 17:07:26 +0100 Subject: [PATCH] chore: change verbose to isize, only println if verbose > 0 (env WEB_SERVER_VERBOSE) --- app_auth/src/lib.rs | 14 +++++++------- app_env/src/appdata.rs | 10 +++++++--- app_env/src/config.rs | 8 ++++---- app_env/src/module.rs | 6 ++++-- kloud/src/defs.rs | 6 ++++-- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app_auth/src/lib.rs b/app_auth/src/lib.rs index 5fc261f..dd960b1 100644 --- a/app_auth/src/lib.rs +++ b/app_auth/src/lib.rs @@ -97,10 +97,10 @@ pub struct AuthStore { impl AuthStore { #[must_use] - pub fn new(config: &WebServer, enforcer: SharedEnforcer,verbose: &str) -> Self { + pub fn new(config: &WebServer, enforcer: SharedEnforcer,verbose: isize) -> Self { Self { - users: Arc::new(RwLock::new(AuthStore::create_user_map(config,&verbose))), - shadows: Arc::new(RwLock::new(AuthStore::create_shadows_map(config,&verbose))), + users: Arc::new(RwLock::new(AuthStore::create_user_map(config,verbose))), + shadows: Arc::new(RwLock::new(AuthStore::create_shadows_map(config,verbose))), sessions: Arc::new(RwLock::new(HashMap::new())), enforcer, } @@ -136,13 +136,13 @@ impl AuthStore { shadows } #[must_use] - pub fn create_user_map(config: &WebServer,verbose: &str) -> HashMap { + pub fn create_user_map(config: &WebServer,verbose: isize) -> HashMap { // TODO load form YAML o CONFIG let mut usrs = HashMap::new(); match config.usrs_store.as_str() { "fs" => { usrs = AuthStore::load_users_from_fs(&config.usrs_store,&config.usrs_store_target); - if !usrs.is_empty() && verbose != "quiet" { + if !usrs.is_empty() && verbose > 0 { println!("Users loaded successfully ({})", &usrs.len()); } }, @@ -151,13 +151,13 @@ impl AuthStore { usrs } #[must_use] - pub fn create_shadows_map(config: &WebServer,verbose: &str) -> HashMap { + pub fn create_shadows_map(config: &WebServer,verbose: isize) -> HashMap { // TODO load form YAML o CONFIG let mut shadows = HashMap::new(); match config.usrs_shadow_store.as_str() { "fs" => { shadows = AuthStore::load_shadows_from_fs(&config.usrs_shadow_store,&config.usrs_shadow_target); - if !shadows.is_empty() && verbose != "quiet" { + if !shadows.is_empty() && verbose > 0 { println!("Users info successfully ({})",&shadows.len()); } }, diff --git a/app_env/src/appdata.rs b/app_env/src/appdata.rs index 1e1b841..b0eee2d 100644 --- a/app_env/src/appdata.rs +++ b/app_env/src/appdata.rs @@ -29,7 +29,7 @@ pub struct AppData { impl AppData { /// Schema creation for `AppEnv` #[must_use] - pub fn new(env: AppEnv) -> Self { + pub fn new(env: AppEnv, verbose: isize) -> Self { let config = env.get_curr_websrvr_config(); let templates_path = config.templates_path.to_owned(); let default_module = config.default_module.to_owned(); @@ -40,7 +40,9 @@ impl AppData { let templates = format!("{}/**/*", &templates_path); tera = match tera::Tera::new(templates.as_str()) { Ok(t) => { - println!("WebServices Templates loaded from: {}", &templates_path); + if verbose > 0 { + println!("WebServices Templates loaded from: {}", &templates_path); + } t } Err(e) => { @@ -58,7 +60,9 @@ impl AppData { for (key, value) in &data_hash { //.iter() { ctx.insert(key, value); } - println!("Default WebServices templates module loaded from: {}", &data_path); + if verbose > 0 { + println!("Default WebServices templates module loaded from: {}", &data_path); + } } Err(e) => { println!("Error parsing data {}:{}", &data_path, e); diff --git a/app_env/src/config.rs b/app_env/src/config.rs index c15ded1..964c118 100644 --- a/app_env/src/config.rs +++ b/app_env/src/config.rs @@ -213,14 +213,14 @@ pub struct Config { } impl Config { - pub fn load_file_content(verbose: &str, cfg_path: &str) -> String { + pub fn load_file_content(verbose: isize, cfg_path: &str) -> String { let config_path: String; if cfg_path.is_empty() { config_path = envmnt::get_or("APP_CONFIG_PATH", "config.toml"); } else { config_path = cfg_path.to_string(); } - if verbose != "quiet" { + if verbose > 0 { println!("Config path: {}", &config_path); } std::fs::read_to_string(&config_path) @@ -229,10 +229,10 @@ impl Config { String::from("") }) } - pub fn new(content: String,verbose: &str) -> Self { + pub fn new(content: String,verbose: isize) -> Self { match toml::from_str(&content) { Ok(cfg) => { - if verbose != "quiet" { + if verbose > 0 { println!("Config Loaded successfully"); } let app_home=envmnt::get_or("APP_HOME", "."); diff --git a/app_env/src/module.rs b/app_env/src/module.rs index 42dc44e..d7ded4f 100644 --- a/app_env/src/module.rs +++ b/app_env/src/module.rs @@ -47,12 +47,14 @@ impl Module { String::from("") }) } - pub fn new(content: String) -> Self { + pub fn new(content: String, verbose: isize) -> Self { // let modul_def: toml::Value = toml::from_str(&content)?; // if let Some(name) = modul_def["name"].as_str() { match toml::from_str(&content) { Ok(cfg) => { - println!("Module Loaded successfully"); + if verbose > 0 { + println!("Module Loaded successfully"); + } cfg }, Err(e) => { diff --git a/kloud/src/defs.rs b/kloud/src/defs.rs index e24f6e3..2490ffc 100644 --- a/kloud/src/defs.rs +++ b/kloud/src/defs.rs @@ -34,8 +34,10 @@ pub struct KloudStore { // impl KloudStore { fn into(s: T) -> T { s.clone() } } impl KloudStore { - pub fn new(data: BTreeMap, coll_key: String, data_ctx: DataContext) -> Self { - println!("Loading {} {} items",&coll_key,data.len()); + pub fn new(data: BTreeMap, coll_key: String, data_ctx: DataContext,verbose: isize) -> Self { + if verbose > 0 { + println!("Loading {} {} items",&coll_key,data.len()); + } Self { entries: Arc::new(RwLock::new(data)), data_ctx,