diff --git a/help.html b/help.html index 954521fc..f636b0c6 100644 --- a/help.html +++ b/help.html @@ -1 +1 @@ -
pub fn get_identity_service(
+get_identity_service in mcaptcha - Rust Function mcaptcha::get_identity_service
source · pub fn get_identity_service(
settings: &Settings
) -> IdentityService<CookieIdentityPolicy>
\ No newline at end of file
diff --git a/mcaptcha/fn.get_json_err.html b/mcaptcha/fn.get_json_err.html
index e0d6c1ec..e49590ca 100644
--- a/mcaptcha/fn.get_json_err.html
+++ b/mcaptcha/fn.get_json_err.html
@@ -1 +1 @@
-get_json_err in mcaptcha - Rust Function mcaptcha::get_json_err
source · pub fn get_json_err() -> JsonConfig
\ No newline at end of file
+get_json_err in mcaptcha - Rust Function mcaptcha::get_json_err
source · pub fn get_json_err() -> JsonConfig
\ No newline at end of file
diff --git a/mcaptcha/index.html b/mcaptcha/index.html
index a1688345..62cc5dc3 100644
--- a/mcaptcha/index.html
+++ b/mcaptcha/index.html
@@ -1 +1 @@
-mcaptcha - Rust
\ No newline at end of file
+mcaptcha - Rust
\ No newline at end of file
diff --git a/mcaptcha/settings/index.html b/mcaptcha/settings/index.html
index 72620a15..ca14ce40 100644
--- a/mcaptcha/settings/index.html
+++ b/mcaptcha/settings/index.html
@@ -1 +1 @@
-mcaptcha::settings - Rust
\ No newline at end of file
+mcaptcha::settings - Rust
\ No newline at end of file
diff --git a/mcaptcha/settings/struct.Settings.html b/mcaptcha/settings/struct.Settings.html
index 122c1134..bfd331aa 100644
--- a/mcaptcha/settings/struct.Settings.html
+++ b/mcaptcha/settings/struct.Settings.html
@@ -9,7 +9,7 @@
pub server: Server,
pub captcha: Captcha,
pub smtp: Option<Smtp>,
-}
debug: bool
§commercial: bool
§source_code: String
§allow_registration: bool
§allow_demo: bool
§database: Database
§redis: Option<Redis>
§server: Server
§captcha: Captcha
§smtp: Option<Smtp>
debug: bool
§commercial: bool
§source_code: String
§allow_registration: bool
§allow_demo: bool
§database: Database
§redis: Option<Redis>
§server: Server
§captcha: Captcha
§smtp: Option<Smtp>
pub struct SETTINGS {
pub(crate) __private_field: (),
-}
__private_field: ()
__private_field: ()
Returns the argument unchanged.
diff --git a/mcaptcha/struct.Settings.html b/mcaptcha/struct.Settings.html index 4e7686ee..72d06e0a 100644 --- a/mcaptcha/struct.Settings.html +++ b/mcaptcha/struct.Settings.html @@ -9,7 +9,7 @@ pub server: Server, pub captcha: Captcha, pub smtp: Option<Smtp>, -}debug: bool
§commercial: bool
§source_code: String
§allow_registration: bool
§allow_demo: bool
§database: Database
§redis: Option<Redis>
§server: Server
§captcha: Captcha
§smtp: Option<Smtp>
debug: bool
§commercial: bool
§source_code: String
§allow_registration: bool
§allow_demo: bool
§database: Database
§redis: Option<Redis>
§server: Server
§captcha: Captcha
§smtp: Option<Smtp>
#![allow(warnings)]
// Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
// SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
@@ -276,7 +278,9 @@
async fn main() -> std::io::Result<()> {
use std::time::Duration;
- env::set_var("RUST_LOG", "info");
+ if env::var("RUST_LOG").is_err() {
+ env::set_var("RUST_LOG", "info");
+ }
pretty_env_logger::init();
info!(
diff --git a/src/mcaptcha/settings.rs.html b/src/mcaptcha/settings.rs.html
index d216d90f..64e0451b 100644
--- a/src/mcaptcha/settings.rs.html
+++ b/src/mcaptcha/settings.rs.html
@@ -404,6 +404,7 @@
404
405
406
+407
// Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
// SPDX-FileCopyrightText: 2023 Aravinth Manivannan <realaravinth@batsense.net>
//
@@ -524,8 +525,8 @@
("database.pool", "MCAPTCHA_database_POOL"),
/* redis */
- ("redis.url", "MCPATCHA_redis_URL"),
- ("redis.pool", "MCPATCHA_redis_POOL"),
+ ("redis.url", "MCAPTCHA_redis_URL"),
+ ("redis.pool", "MCAPTCHA_redis_POOL"),
/* server */
("server.port", "PORT"),
@@ -551,12 +552,12 @@
/* SMTP */
- ("smtp.from", "MCPATCHA_smtp_FROM"),
- ("smtp.reply", "MCPATCHA_smtp_REPLY"),
- ("smtp.url", "MCPATCHA_smtp_URL"),
- ("smtp.username", "MCPATCHA_smtp_USERNAME"),
- ("smtp.password", "MCPATCHA_smtp_PASSWORD"),
- ("smtp.port", "MCPATCHA_smtp_PORT"),
+ ("smtp.from", "MCAPTCHA_smtp_FROM"),
+ ("smtp.reply", "MCAPTCHA_smtp_REPLY"),
+ ("smtp.url", "MCAPTCHA_smtp_URL"),
+ ("smtp.username", "MCAPTCHA_smtp_USERNAME"),
+ ("smtp.password", "MCAPTCHA_smtp_PASSWORD"),
+ ("smtp.port", "MCAPTCHA_smtp_PORT"),
@@ -617,6 +618,7 @@
fn env_override(mut s: ConfigBuilder<DefaultState>) -> ConfigBuilder<DefaultState> {
for (parameter, env_var_name) in ENV_VAR_CONFIG.iter() {
+ println!("[{env_var_name}]{:?}", env::var(env_var_name));
if let Ok(val) = env::var(env_var_name) {
log::debug!(
"Overriding [{parameter}] with environment variable {env_var_name}"
@@ -697,7 +699,7 @@
/* redis */
/* redis.url */
- let env = "MCPATCHA_redis_URL";
+ let env = "MCAPTCHA_redis_URL";
let val = "redis://redis.example.org";
println!("Setting env var {} to {} for test", env, val);
env::set_var(env, val);
@@ -710,7 +712,7 @@
env::remove_var(env);
/* redis.pool */
- let env = "MCPATCHA_redis_POOL";
+ let env = "MCAPTCHA_redis_POOL";
let val = 999;
println!("Setting env var {} to {} for test", env, val);
env::set_var(env, val.to_string());
@@ -761,12 +763,12 @@
/* SMTP */
let vals = [
- "MCPATCHA_smtp_FROM",
- "MCPATCHA_smtp_REPLY",
- "MCPATCHA_smtp_URL",
- "MCPATCHA_smtp_USERNAME",
- "MCPATCHA_smtp_PASSWORD",
- "MCPATCHA_smtp_PORT",
+ "MCAPTCHA_smtp_FROM",
+ "MCAPTCHA_smtp_REPLY",
+ "MCAPTCHA_smtp_URL",
+ "MCAPTCHA_smtp_USERNAME",
+ "MCAPTCHA_smtp_PASSWORD",
+ "MCAPTCHA_smtp_PORT",
];
for env in vals.iter() {
println!("Setting env var {} to {} for test", env, env);
@@ -774,15 +776,15 @@
}
let port = 9999;
- env::set_var("MCPATCHA_smtp_PORT", port.to_string());
+ env::set_var("MCAPTCHA_smtp_PORT", port.to_string());
new_settings = get_settings();
let smtp_new = new_settings.smtp.as_ref().unwrap();
let smtp_old = init_settings.smtp.as_ref().unwrap();
- assert_eq!(smtp_new.from, "MCPATCHA_smtp_FROM");
- assert_eq!(smtp_new.reply, "MCPATCHA_smtp_REPLY");
- assert_eq!(smtp_new.username, "MCPATCHA_smtp_USERNAME");
- assert_eq!(smtp_new.password, "MCPATCHA_smtp_PASSWORD");
+ assert_eq!(smtp_new.from, "MCAPTCHA_smtp_FROM");
+ assert_eq!(smtp_new.reply, "MCAPTCHA_smtp_REPLY");
+ assert_eq!(smtp_new.username, "MCAPTCHA_smtp_USERNAME");
+ assert_eq!(smtp_new.password, "MCAPTCHA_smtp_PASSWORD");
assert_eq!(smtp_new.port, port);
assert_ne!(smtp_new, smtp_old);