highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-09-06 02:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

http: log connection instead of request count

Browse Source 
There is no significant benefit in logging the request count instead
of the connection count. Reduces amount of code and computational
complexity.
This commit is contained in:
stickies-v
2023-09-29 15:38:51 +01:00
parent 41f9027813
commit 084d037231
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/httpserver.cpp
View File

@@ -27,7 +27,6 @@
#include <cstdlib> #include <cstdlib>
#include <deque> #include <deque>
#include <memory> #include <memory>
#include <numeric>
#include <optional> #include <optional>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@@ -193,13 +192,6 @@ public:
auto it{m_tracker.find(Assert(conn))}; auto it{m_tracker.find(Assert(conn))};
if (it != m_tracker.end()) RemoveConnectionInternal(it); if (it != m_tracker.end()) RemoveConnectionInternal(it);
} }
size_t CountActiveRequests() const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
{
LOCK(m_mutex);
return std::accumulate(m_tracker.begin(), m_tracker.end(), size_t(0),
[](size_t acc_count, const auto& pair) { return acc_count + pair.second; });
}
size_t CountActiveConnections() const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex) size_t CountActiveConnections() const EXCLUSIVE_LOCKS_REQUIRED(!m_mutex)
{ {
return WITH_LOCK(m_mutex, return m_tracker.size()); return WITH_LOCK(m_mutex, return m_tracker.size());
@@ -530,8 +522,8 @@ void StopHTTPServer()
} }
boundSockets.clear(); boundSockets.clear();
{ {
if (g_requests.CountActiveConnections() != 0) { if (const auto n_connections{g_requests.CountActiveConnections()}; n_connections != 0) {
LogPrint(BCLog::HTTP, "Waiting for %d requests to stop HTTP server\n", g_requests.CountActiveRequests()); LogPrint(BCLog::HTTP, "Waiting for %d connections to stop HTTP server\n", n_connections);
} }
g_requests.WaitUntilEmpty(); g_requests.WaitUntilEmpty();
} }