Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 23:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

bring back busy_timeout

Browse Source
This commit is contained in:
dignifiedquire
2020-05-19 13:30:15 +02:00
parent f7a7debd9d
commit f81c1afde7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql.rs
View File

@@ -5,6 +5,7 @@ use async_std::sync::{Arc, RwLock};
use std::collections::HashSet; use std::collections::HashSet;
use std::path::Path; use std::path::Path;
use std::time::Duration;
use rusqlite::{Connection, Error as SqlError, OpenFlags}; use rusqlite::{Connection, Error as SqlError, OpenFlags};
use thread_local_object::ThreadLocal; use thread_local_object::ThreadLocal;
@@ -709,13 +710,16 @@ async fn open(
let mgr = r2d2_sqlite::SqliteConnectionManager::file(dbfile.as_ref()) let mgr = r2d2_sqlite::SqliteConnectionManager::file(dbfile.as_ref())
.with_flags(open_flags) .with_flags(open_flags)
.with_init(|c| { .with_init(|c| {
c.execute_batch("PRAGMA secure_delete=on;")?; c.execute_batch(&format!(
"PRAGMA secure_delete=on; PRAGMA busy_timeout = {};",
Duration::from_secs(10).as_millis()
))?;
Ok(()) Ok(())
}); });
let pool = r2d2::Pool::builder() let pool = r2d2::Pool::builder()
.min_idle(Some(2)) .min_idle(Some(2))
.max_size(10) .max_size(10)
.connection_timeout(std::time::Duration::new(60, 0)) .connection_timeout(Duration::from_secs(60))
.build(mgr) .build(mgr)
.map_err(Error::ConnectionPool)?; .map_err(Error::ConnectionPool)?;