diff --git a/lib/libimhex/include/hex/helpers/http_requests.hpp b/lib/libimhex/include/hex/helpers/http_requests.hpp index 63eac6dcc..db286110c 100644 --- a/lib/libimhex/include/hex/helpers/http_requests.hpp +++ b/lib/libimhex/include/hex/helpers/http_requests.hpp @@ -61,21 +61,8 @@ namespace hex { T m_data; }; - HttpRequest(std::string method, std::string url) : m_method(std::move(method)), m_url(std::move(url)) { - AT_FIRST_TIME { - curl_global_init(CURL_GLOBAL_ALL); - }; - - AT_FINAL_CLEANUP { - curl_global_cleanup(); - }; - - this->m_curl = curl_easy_init(); - } - - ~HttpRequest() { - curl_easy_cleanup(this->m_curl); - } + HttpRequest(std::string method, std::string url); + ~HttpRequest(); HttpRequest(const HttpRequest&) = delete; HttpRequest& operator=(const HttpRequest&) = delete; diff --git a/lib/libimhex/include/hex/helpers/logger.hpp b/lib/libimhex/include/hex/helpers/logger.hpp index 4f212b365..9c1016fab 100644 --- a/lib/libimhex/include/hex/helpers/logger.hpp +++ b/lib/libimhex/include/hex/helpers/logger.hpp @@ -31,9 +31,6 @@ namespace hex::log { template [[maybe_unused]] void print(const fmt::text_style &ts, const std::string &level, const std::string &fmt, auto... args) { - static std::mutex logMutex; - std::scoped_lock lock(logMutex); - auto dest = getDestination(); printPrefix(dest, ts, level); diff --git a/lib/libimhex/source/helpers/http_requests.cpp b/lib/libimhex/source/helpers/http_requests.cpp index 8ff33fae7..38a061f78 100644 --- a/lib/libimhex/source/helpers/http_requests.cpp +++ b/lib/libimhex/source/helpers/http_requests.cpp @@ -5,6 +5,22 @@ namespace hex { std::string HttpRequest::s_caCertData; std::string HttpRequest::s_proxyUrl; + HttpRequest::HttpRequest(std::string method, std::string url) : m_method(std::move(method)), m_url(std::move(url)) { + AT_FIRST_TIME { + curl_global_init(CURL_GLOBAL_ALL); + }; + + AT_FINAL_CLEANUP { + curl_global_cleanup(); + }; + + this->m_curl = curl_easy_init(); + } + + HttpRequest::~HttpRequest() { + curl_easy_cleanup(this->m_curl); + } + void HttpRequest::setDefaultConfig() { curl_easy_setopt(this->m_curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS); curl_easy_setopt(this->m_curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);