v0.3.2-pre.004-fix.001

This commit is contained in:
2026-08-29 19:04:58 +02:00
parent 0a4cddafc4
commit de3cec6a23
3 changed files with 21 additions and 32 deletions

View File

@@ -117,12 +117,7 @@ impl PostgresPoolSettings {
.with_context("maximum", MAX_CONNECTIONS.to_string()),
);
}
let connect_validation = validate_duration(
"postgres.pool.connect_timeout",
self.connect_timeout,
MIN_CONNECT_TIMEOUT_MS,
MAX_CONNECT_TIMEOUT_MS,
);
let connect_validation = validate_duration("postgres.pool.connect_timeout", self.connect_timeout, MIN_CONNECT_TIMEOUT_MS, MAX_CONNECT_TIMEOUT_MS);
if let std::result::Result::Err(error) = connect_validation {
return std::result::Result::Err(error);
}
@@ -130,21 +125,12 @@ impl PostgresPoolSettings {
if let std::result::Result::Err(error) = wait_validation {
return std::result::Result::Err(error);
}
let create_validation = validate_duration(
"postgres.pool.create_timeout",
self.create_timeout,
MIN_POOL_CREATE_TIMEOUT_MS,
MAX_POOL_CREATE_TIMEOUT_MS,
);
let create_validation = validate_duration("postgres.pool.create_timeout", self.create_timeout, MIN_POOL_CREATE_TIMEOUT_MS, MAX_POOL_CREATE_TIMEOUT_MS);
if let std::result::Result::Err(error) = create_validation {
return std::result::Result::Err(error);
}
let recycle_validation = validate_duration(
"postgres.pool.recycle_timeout",
self.recycle_timeout,
MIN_POOL_RECYCLE_TIMEOUT_MS,
MAX_POOL_RECYCLE_TIMEOUT_MS,
);
let recycle_validation =
validate_duration("postgres.pool.recycle_timeout", self.recycle_timeout, MIN_POOL_RECYCLE_TIMEOUT_MS, MAX_POOL_RECYCLE_TIMEOUT_MS);
if let std::result::Result::Err(error) = recycle_validation {
return std::result::Result::Err(error);
}
@@ -199,12 +185,8 @@ impl PostgresBootstrapSettings {
/// Validates bootstrap and migration deadlines without contacting PostgreSQL.
pub fn validate(&self) -> ksp_store_api::Result<()> {
let migration_validation = validate_duration(
"postgres.bootstrap.migration_timeout",
self.migration_timeout,
MIN_MIGRATION_TIMEOUT_MS,
MAX_MIGRATION_TIMEOUT_MS,
);
let migration_validation =
validate_duration("postgres.bootstrap.migration_timeout", self.migration_timeout, MIN_MIGRATION_TIMEOUT_MS, MAX_MIGRATION_TIMEOUT_MS);
if let std::result::Result::Err(error) = migration_validation {
return std::result::Result::Err(error);
}