Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

increase sqlite timeout

Browse Source
This commit is contained in:
Aiden McClelland
2021-10-05 12:30:59 -06:00
committed by Aiden McClelland
parent c415936f15
commit 381b5c4855
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
appmgr/src/context/rpc.rs
View File

@@ -5,6 +5,7 @@ use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicU64, AtomicUsize}; use std::sync::atomic::{AtomicU64, AtomicUsize};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration;
use bollard::Docker; use bollard::Docker;
use log::LevelFilter; use log::LevelFilter;
@@ -15,7 +16,8 @@ use rpc_toolkit::url::Host;
use rpc_toolkit::Context; use rpc_toolkit::Context;
use serde::Deserialize; use serde::Deserialize;
use sqlx::migrate::MigrateDatabase; use sqlx::migrate::MigrateDatabase;
use sqlx::{Sqlite, SqlitePool}; use sqlx::sqlite::SqliteConnectOptions;
use sqlx::{ConnectOptions, Sqlite, SqlitePool};
use tokio::fs::File; use tokio::fs::File;
use tokio::sync::broadcast::Sender; use tokio::sync::broadcast::Sender;
use tokio::sync::RwLock; use tokio::sync::RwLock;
@@ -91,14 +93,13 @@ impl RpcContextConfig {
Ok(db) Ok(db)
} }
pub async fn secret_store(&self) -> Result<SqlitePool, Error> { pub async fn secret_store(&self) -> Result<SqlitePool, Error> {
let secret_store_url = format!( let secret_store = SqlitePool::connect_with(
"sqlite://{}", SqliteConnectOptions::new()
self.datadir().join("main").join("secrets.db").display() .filename(self.datadir().join("main").join("secrets.db"))
); .create_if_missing(true)
if !Sqlite::database_exists(&secret_store_url).await? { .busy_timeout(Duration::from_secs(30)),
Sqlite::create_database(&secret_store_url).await?; )
} .await?;
let secret_store = SqlitePool::connect(&secret_store_url).await?;
sqlx::migrate!() sqlx::migrate!()
.run(&secret_store) .run(&secret_store)
.await .await

15
appmgr/src/context/setup.rs
View File

@@ -99,14 +99,13 @@ impl SetupContext {
Ok(db) Ok(db)
} }
pub async fn secret_store(&self) -> Result<SqlitePool, Error> { pub async fn secret_store(&self) -> Result<SqlitePool, Error> {
let secret_store_url = format!( let secret_store = SqlitePool::connect_with(
"sqlite://{}", SqliteConnectOptions::new()
self.datadir.join("main").join("secrets.db").display() .filename(self.datadir().join("main").join("secrets.db"))
); .create_if_missing(true)
if !Sqlite::database_exists(&secret_store_url).await? { .busy_timeout(Duration::from_secs(30)),
Sqlite::create_database(&secret_store_url).await?; )
} .await?;
let secret_store = SqlitePool::connect(&secret_store_url).await?;
sqlx::migrate!() sqlx::migrate!()
.run(&secret_store) .run(&secret_store)
.await .await