Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-24 09:16:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Increase timeout for QR generation to 60s (#5882)

Browse Source 
On big accounts, it can take more than 10s, so that QR generation
failed.
This commit is contained in:
Hocuri
2024-08-14 22:46:48 +02:00
committed by GitHub
parent de517c15ff
commit 0c3a476449
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deltachat-jsonrpc/src/api.rs
View File

@@ -1672,10 +1672,10 @@ impl CommandApi {
/// ///
/// This call will block until the QR code is ready, /// This call will block until the QR code is ready,
/// even if there is no concurrent call to [`CommandApi::provide_backup`], /// even if there is no concurrent call to [`CommandApi::provide_backup`],
/// but will fail after 10 seconds to avoid deadlocks. /// but will fail after 60 seconds to avoid deadlocks.
async fn get_backup_qr(&self, account_id: u32) -> Result<String> { async fn get_backup_qr(&self, account_id: u32) -> Result<String> {
let qr = tokio::time::timeout( let qr = tokio::time::timeout(
Duration::from_secs(10), Duration::from_secs(60),
self.inner_get_backup_qr(account_id), self.inner_get_backup_qr(account_id),
) )
.await .await
@@ -1691,13 +1691,13 @@ impl CommandApi {
/// ///
/// This call will block until the QR code is ready, /// This call will block until the QR code is ready,
/// even if there is no concurrent call to [`CommandApi::provide_backup`], /// even if there is no concurrent call to [`CommandApi::provide_backup`],
/// but will fail after 10 seconds to avoid deadlocks. /// but will fail after 60 seconds to avoid deadlocks.
/// ///
/// Returns the QR code rendered as an SVG image. /// Returns the QR code rendered as an SVG image.
async fn get_backup_qr_svg(&self, account_id: u32) -> Result<String> { async fn get_backup_qr_svg(&self, account_id: u32) -> Result<String> {
let ctx = self.get_context(account_id).await?; let ctx = self.get_context(account_id).await?;
let qr = tokio::time::timeout( let qr = tokio::time::timeout(
Duration::from_secs(10), Duration::from_secs(60),
self.inner_get_backup_qr(account_id), self.inner_get_backup_qr(account_id),
) )
.await .await