From c73de142ad5c31c1ffd16b7485a2618b5e2b32d4 Mon Sep 17 00:00:00 2001 From: mdecimus Date: Mon, 26 May 2025 16:22:35 +0200 Subject: [PATCH] Fix: Failed to parse setting dav.lock.max-timeout (closes #1559) --- crates/common/src/config/groupware.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/common/src/config/groupware.rs b/crates/common/src/config/groupware.rs index 9d5c75a9..7b771d4d 100644 --- a/crates/common/src/config/groupware.rs +++ b/crates/common/src/config/groupware.rs @@ -4,6 +4,8 @@ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL */ +use std::time::Duration; + use utils::config::Config; #[derive(Debug, Clone, Default)] @@ -42,7 +44,10 @@ impl GroupwareConfig { .property_or_default::>("dav.property.max-size.dead", "1024") .unwrap_or(Some(1024)), live_property_size: config.property("dav.property.max-size.live").unwrap_or(250), - max_lock_timeout: config.property("dav.lock.max-timeout").unwrap_or(3600), + max_lock_timeout: config + .property::("dav.lock.max-timeout") + .map(|d| d.as_secs()) + .unwrap_or(3600), max_locks_per_user: config.property("dav.locks.max-per-user").unwrap_or(10), max_results: config.property("dav.response.max-results").unwrap_or(2000), default_calendar_name: config