summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2023-10-25 19:41:53 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2023-10-25 19:41:53 +0200
commit51976cf367b703589aa471766a481c1e0f74712d (patch)
tree56c6cdc5ff2395197de4c5e93226cb4d668940b8 /src
parentProperly close cursors before commit and db deletion (diff)
downloadnheko-51976cf367b703589aa471766a481c1e0f74712d.tar.xz
Fix linting
Diffstat (limited to 'src')
-rw-r--r--src/Cache.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Cache.cpp b/src/Cache.cpp

index a5d970ca..f110fef3 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp
@@ -1724,9 +1724,9 @@ Cache::runMigrations() [this]() { // migrate olm sessions to a single db try { - auto txn = lmdb::txn::begin(env_, nullptr); - auto mainDb = lmdb::dbi::open(txn); - auto dbNames = lmdb::cursor::open(txn, mainDb); + auto txn = lmdb::txn::begin(env_, nullptr); + auto mainDb = lmdb::dbi::open(txn); + auto dbNames = lmdb::cursor::open(txn, mainDb); bool doCommit = false; std::string_view dbName; @@ -1734,7 +1734,7 @@ Cache::runMigrations() if (!dbName.starts_with("olm_sessions.v2/")) continue; - doCommit = true; + doCommit = true; auto curveKey = dbName; curveKey.remove_prefix(std::string_view("olm_sessions.v2/").size()); @@ -1754,7 +1754,8 @@ Cache::runMigrations() } dbNames.close(); - if (doCommit) txn.commit(); + if (doCommit) + txn.commit(); } catch (const lmdb::error &e) { nhlog::db()->critical("Failed to convert olm sessions database in migration! {}", e.what());