From a72eca339fd5237ba7189e8aa70d25666a7a8e90 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Fri, 22 Jun 2018 19:47:55 +0300
Subject: [PATCH] Immediately shutdown the http client on exit
---
deps/CMakeLists.txt | 2 +-
src/main.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 06b1f7e10..20b356deb 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MATRIX_STRUCTS_URL https://github.com/mujx/matrix-structs)
set(MATRIX_STRUCTS_TAG eeb7373729a1618e2b3838407863342b88b8a0de)
set(MTXCLIENT_URL https://github.com/mujx/mtxclient)
-set(MTXCLIENT_TAG 68188721e042ff5b47ea9a87aa97d3a9efbca989)
+set(MTXCLIENT_TAG 96fd35e57d36511b10b7d30de7227c6cd2ffa386)
set(OLM_URL https://git.matrix.org/git/olm.git)
set(OLM_TAG 4065c8e11a33ba41133a086ed3de4da94dcb6bae)
diff --git a/src/main.cc b/src/main.cc
index 327ec5877..7ef5834ef 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -166,9 +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();
+ nhlog::net()->debug("shutting down all I/O threads & open connections");
http::v2::client()->close(true);
+ nhlog::net()->debug("bye");
}
});
--
GitLab