From ed32664b9edecf3b6e34f4ec81e03d5ddeb3465a Mon Sep 17 00:00:00 2001 From: charlie Date: Sun, 17 Sep 2023 20:09:53 +0200 Subject: [PATCH] Adding workers data to api in stratum files --- src/stratum_server.cpp | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/stratum_server.cpp b/src/stratum_server.cpp index f460e82b..a09e2c15 100644 --- a/src/stratum_server.cpp +++ b/src/stratum_server.cpp @@ -1338,7 +1338,7 @@ void StratumServer::api_update_local_stats(uint64_t timestamp) const double block_reward_share_percent = m_pool->side_chain().get_reward_share(m_pool->params().m_wallet) * 100.0; m_pool->api()->set(p2pool_api::Category::LOCAL, "stratum", - [hashrate_15m, hashrate_1h, hashrate_24h, total_hashes, shares_found, shares_failed, average_effort, current_effort, connections, incoming_connections, block_reward_share_percent](log::Stream& s) + [hashrate_15m, hashrate_1h, hashrate_24h, total_hashes, shares_found, shares_failed, average_effort, current_effort, connections, incoming_connections, block_reward_share_percent,timestamp, this](log::Stream& s) { s << "{\"hashrate_15m\":" << hashrate_15m << ",\"hashrate_1h\":" << hashrate_1h @@ -1351,7 +1351,37 @@ void StratumServer::api_update_local_stats(uint64_t timestamp) << ",\"connections\":" << connections << ",\"incoming_connections\":" << incoming_connections << ",\"block_reward_share_percent\":" << block_reward_share_percent - << "}"; + << ",\"workers\":["; + + bool first = true; + + for (const StratumClient* client = static_cast(m_connectedClientsList->m_next); client != m_connectedClientsList; client = static_cast(client->m_next)) { + if (!first) { + s << ','; + } + const difficulty_type pool_diff = m_pool->side_chain().difficulty(); + difficulty_type diff = pool_diff; + if (client->m_lastJobTarget > 1) { + uint64_t r; + diff.lo = udiv128(1, 0, client->m_lastJobTarget, &r); + diff.hi = 0; + if (r) { + ++diff.lo; + } + } + + s << '"' << static_cast(client->m_addrString) << ',' + << (timestamp - client->m_connectedTime) << ',' + << diff << ',' + << (client->m_autoDiff.lo / AUTO_DIFF_TARGET_TIME) << ',' + << (client->m_rpcId ? client->m_customUser : "not logged in") + << '"'; + + + first = false; + } + + s << "]}"; }); }