fix: downgrade deadpool so it stays on tokio 0.2

needed for its timer usage (when enabling connection timeouts) and set a default connection timeout Closes #977, #976
mozilla-services · Jan 21, 2021 · 99975ef · 99975ef
1 parent 0101eac
commit 99975ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,8 @@ bytes = "1.0"
 cadence = "0.23"
 chrono = "0.4"
 config = "0.10"
-deadpool = "0.7"
+# Pin to 0.5 for now, to keep it under tokio 0.2 (issue977)
+deadpool = "0.5"
 diesel = { version = "1.4", features = ["mysql", "r2d2"] }
 diesel_logger = "0.1.1"
 diesel_migrations = { version = "1.4.0", features = ["mysql"] }

diff --git a/src/settings.rs b/src/settings.rs
@@ -111,6 +111,7 @@ impl Settings {
         s.set_default("host", "127.0.0.1")?;
         s.set_default("human_logs", false)?;
         #[cfg(test)]
+        s.set_default("database_pool_connection_timeout", Some(30))?;
         s.set_default("database_use_test_transactions", false)?;
         s.set_default("master_secret", "")?;
         s.set_default::<Option<String>>("tokenserver_database_url", None)?;