backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 15:51:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move database config to separate section

Browse source 
This renames:

database_backend -> database.backend
database_path -> database.path
db_cache_capacity_mb -> database.cache_capacity_mb
rocksdb_max_open_files -> database.rocksdb_max_open_files

Charles updated the NixOS module.

Co-authored-by: Charles Hall <charles@computer.surgery>
This commit is contained in:
Lambda 2024-06-16 13:24:28 +00:00 • committed by Charles Hall
parent 79d5d306cc
commit d26b87a2f2
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
6 changed files with 39 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/database.rs
View file

@ -250,7 +250,7 @@ pub(crate) struct KeyValueDatabase {
impl KeyValueDatabase {
fn check_db_setup(config: &Config) -> Result<()> {
let path = Path::new(&config.database_path);
let path = Path::new(&config.database.path);
let sqlite_exists = path
.join(format!(
@ -279,14 +279,14 @@ impl KeyValueDatabase {
return Ok(());
}
if sqlite_exists && config.database_backend != "sqlite" {
if sqlite_exists && config.database.backend != "sqlite" {
return Err(Error::bad_config(
"Found sqlite at database_path, but is not specified in \
config.",
));
}
if rocksdb_exists && config.database_backend != "rocksdb" {
if rocksdb_exists && config.database.backend != "rocksdb" {
return Err(Error::bad_config(
"Found rocksdb at database_path, but is not specified in \
config.",
@ -305,8 +305,8 @@ impl KeyValueDatabase {
pub(crate) async fn load_or_create(config: Config) -> Result<()> {
Self::check_db_setup(&config)?;
if !Path::new(&config.database_path).exists() {
fs::create_dir_all(&config.database_path).map_err(|_| {
if !Path::new(&config.database.path).exists() {
fs::create_dir_all(&config.database.path).map_err(|_| {
Error::BadConfig(
"Database folder doesn't exists and couldn't be created \
(e.g. due to missing permissions). Please create the \
@ -320,7 +320,8 @@ impl KeyValueDatabase {
allow(unused_variables)
)]
let builder: Arc<dyn KeyValueDatabaseEngine> = match &*config
.database_backend
.database
.backend
{
#[cfg(feature = "sqlite")]
"sqlite" => {
@ -1106,7 +1107,7 @@ impl KeyValueDatabase {
info!(
"Loaded {} database with version {}",
services().globals.config.database_backend,
services().globals.config.database.backend,
latest_database_version
);
} else {
@ -1119,7 +1120,7 @@ impl KeyValueDatabase {
warn!(
"Created new {} database with version {}",
services().globals.config.database_backend,
services().globals.config.database.backend,
latest_database_version
);
}