Added support for .env files

Author: lovasoa

CHANGELOG.md

@@ -79,6 +79,7 @@ and does not even need to listen on port 80 to do so.
  - The `cookie` component now supports setting an explicit expiration date for cookies.
  - The `cookie` component now supports setting the `SameSite` attribute of cookies, and defaults to `SameSite=Strict` for all cookies. What this means in practice is that cookies set by SQLPage will not be sent to your website if the user is coming from another website. This prevents someone from tricking your users into executing SQLPage queries on your website by sending them a malicious link.
  - Bugfix: setting `min` or `max` to `0` in a number field in the `form` component now works as expected.
+ - Added support for `.env` files to set SQLPage's [environment variables](./configuration.md#environment-variables).
 
 ## 0.16.1 (2023-11-22)
 

Cargo.lock

@@ -48,6 +48,7 @@ rand = "0.8.5"
 actix-multipart = "0.6.1"
 base64 = "0.21.5"
 rustls-acme = "0.7.7"
+dotenvy = "0.15.7"
 
 [build-dependencies]
 awc = { version = "3", features = ["rustls"] }

Cargo.toml

@@ -24,6 +24,9 @@ on a [JSON](https://en.wikipedia.org/wiki/JSON) file placed in `sqlpage/sqlpage.
 
 You can find an example configuration file in [`sqlpage/sqlpage.json`](./sqlpage/sqlpage.json).
 
+Multiple configuration file formats are supported:
+you can use a [`.json5`](https://json5.org/) file, a [`.toml`](https://toml.io/) file, or a [`.yaml`](https://en.wikipedia.org/wiki/YAML#Syntax) file.
+
 ## Environment variables
 
 All the parameters above can be set through environment variables.
@@ -36,7 +39,9 @@ The environment variable name can optionally be prefixed with `SQLPAGE_`.
 Additionnally, when troubleshooting, you can set the [`RUST_LOG`](https://docs.rs/env_logger/latest/env_logger/#enabling-logging)
 environment variable to `sqlpage=debug` to get more detailed logs and see exactly what SQLPage is doing.
 
-### Example
+If you have a `.env` file in the current directory or in any of its parent directories, SQLPage will automatically load environment variables from it.
+
+### Example `.env` file
 
 ```bash
 DATABASE_URL="sqlite:///path/to/my_database.db?mode=rwc"

configuration.md

@@ -17,7 +17,7 @@ async fn start() -> anyhow::Result<()> {
     log::debug!("Starting with the following configuration: {app_config:?}");
     let state = AppState::init(&app_config).await?;
     webserver::database::migrations::apply(&state.db).await?;
-    log::info!("Starting server on {}", app_config.listen_on);
+    log::debug!("Starting server on {}", app_config.listen_on);
     let (r, _) = tokio::join!(
         webserver::http::run_server(&app_config, state),
         log_welcome_message(&app_config)
@@ -49,8 +49,18 @@ async fn log_welcome_message(config: &AppConfig) {
 }
 
 fn init_logging() {
-    let env = env_logger::Env::new().default_filter_or("info");
+    let load_env = dotenvy::dotenv();
+
+    let env = env_logger::Env::new().default_filter_or("sqlpage=info");
     let mut logging = env_logger::Builder::from_env(env);
     logging.format_timestamp_millis();
     logging.init();
-}
+
+    match load_env {
+        Ok(path) => log::info!("Loaded environment variables from {path:?}"),
+        Err(dotenvy::Error::Io(e)) if e.kind() == std::io::ErrorKind::NotFound => log::debug!(
+            "No .env file found, using only environment variables and configuration files"
+        ),
+        Err(e) => log::error!("Error loading .env file: {}", e),
+    }
+}