Add a timeout around the database locks.

NLnetLabs · Feb 6, 2025 · 7ac8925 · 7ac8925
1 parent 27b9eea
commit 7ac8925
Show file tree

Hide file tree

Showing 4 changed files with 266 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,6 @@ percent-encoding = "2.3.1"
 pin-project-lite = "0.2.15"
 postgres        = { version = "0.19", features = ["with-serde_json-1"], optional = true }
 postgres-types  = { version = "0.2", features = ["derive"], optional = true }
-r2d2_postgres   = { version = "0.18", optional = true }
 r2d2            = { version = "0.8.10", optional = true }
 rand            = "0.8"
 regex           = { version = "1.11.1", optional = true, default-features = false, features = [ "std" ] }
@@ -78,7 +77,7 @@ syslog = "6.1.1"
 
 [features]
 default = ["multi-user", "hsm", "postgres"]
-hsm = ["backoff", "kmip", "cryptoki", "r2d2"]
+hsm = ["backoff", "kmip", "cryptoki", "dep:r2d2"]
 multi-user = [
     "basic-cookies",
     "regex",
@@ -88,7 +87,7 @@ multi-user = [
     "unicode-normalization",
     "urlparse",
 ]
-postgres = ["dep:postgres", "dep:r2d2_postgres", "dep:postgres-types"]
+postgres = ["dep:postgres", "dep:r2d2", "dep:postgres-types"]
 static-openssl = ["openssl/vendored"]
 
 # Preview features - not ready for production use

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -4,3 +4,4 @@ pub mod client;
 pub mod options;
 pub mod report;
 pub mod ta;
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ pub mod client;
		pub mod options;
		pub mod report;
		pub mod ta;