Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion contrib/db_pools/lib/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use rocket::serde::{Deserialize, Serialize};
/// For higher-level details on configuring a database, see the [crate-level
/// docs](crate#configuration).
// NOTE: Defaults provided by the figment created in the `Initializer` fairing.
#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[serde(crate = "rocket::serde")]
pub struct Config {
/// Database-specific connection and configuration URL.
Expand Down Expand Up @@ -93,3 +93,28 @@ pub struct Config {
/// _Default:_ `None`.
pub extensions: Option<Vec<String>>,
}

impl Default for Config {
fn default() -> Self {
Self {
url: Default::default(),
min_connections: Default::default(),
max_connections: rocket::Config::default().workers * 4,
connect_timeout: 5,
idle_timeout: Default::default(),
extensions: Default::default(),
}
}
}

#[cfg(test)]
mod tests {
use super::Config;

#[test]
fn default_values_sane() {
let config = Config::default();
assert_ne!(config.max_connections, 0);
assert_eq!(config.connect_timeout, 5);
}
}
Loading