diff options
| -rw-r--r-- | src/block/rc.rs | 4 | ||||
| -rw-r--r-- | src/garage/server.rs | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/block/rc.rs b/src/block/rc.rs index f6d8c2aa..7d85f67e 100644 --- a/src/block/rc.rs +++ b/src/block/rc.rs @@ -26,9 +26,7 @@ impl BlockRc { Some(x) => { tx.insert(&self.rc, &hash, x)?; } - None => { - tx.remove(&self.rc, &hash)?; - } + None => unreachable!(), }; tx.commit(old_rc) })?; diff --git a/src/garage/server.rs b/src/garage/server.rs index bd34456d..a56f124a 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -32,9 +32,9 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { let config = read_config(config_file).expect("Unable to read config file"); info!("Opening database..."); + let mut db_path = config.metadata_dir.clone(); let db = match config.db_engine.as_str() { "sled" => { - let mut db_path = config.metadata_dir.clone(); db_path.push("db"); let db = db::sled_adapter::sled::Config::default() .path(&db_path) @@ -44,8 +44,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { .expect("Unable to open sled DB"); db::sled_adapter::SledDb::init(db) } - "sqlite" => { - let mut db_path = config.metadata_dir.clone(); + "sqlite" | "sqlite3" | "rusqlite" => { db_path.push("db.sqlite"); let db = db::sqlite_adapter::rusqlite::Connection::open(db_path) .expect("Unable to open sqlite DB"); |