summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-17 18:44:04 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-17 18:44:04 +0300
commit197b2dac748563f99de4a941a59e795dc759cca0 (patch)
tree93f4eea1f9c5b8bc64a1052a1dffef25a635c4de /src
parentSetup BinTray (diff)
downloadnheko-197b2dac748563f99de4a941a59e795dc759cca0.tar.xz
Fix regressions regarding invites & slowness during shutdown
Diffstat (limited to 'src')
-rw-r--r--src/Cache.cc3
-rw-r--r--src/main.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Cache.cc b/src/Cache.cc

index 41a759ab..397dd05f 100644 --- a/src/Cache.cc +++ b/src/Cache.cc
@@ -900,7 +900,8 @@ Cache::getRoomInfo(const std::vector<std::string> &rooms) { std::map<QString, RoomInfo> room_info; - auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY); + // TODO This should be read only. + auto txn = lmdb::txn::begin(env_); for (const auto &room : rooms) { lmdb::val data; diff --git a/src/main.cc b/src/main.cc
index 24524c2c..327ec587 100644 --- a/src/main.cc +++ b/src/main.cc
@@ -166,8 +166,9 @@ main(int argc, char *argv[]) QObject::connect(&app, &QApplication::aboutToQuit, &w, [&w]() { w.saveCurrentWindowSize(); if (http::v2::client() != nullptr) { + nhlog::net()->info("shutting down all I/O threads & open connections"); http::v2::client()->shutdown(); - http::v2::client()->close(); + http::v2::client()->close(true); } });