gf4
/
p2pool
mirror of https://github.com/SChernykh/p2pool
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed CI errors

merge-mining
SChernykh 2024-06-03 19:37:28 +02:00
parent 9cd9055913
commit a188ca7fad
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/console_commands.cpp
View File

@ -126,11 +126,6 @@ ConsoleCommands::ConsoleCommands(p2pool* pool)
m_loopThreadCreated = true;
}
ConsoleCommands::~ConsoleCommands()
{
shutdown_tcp();
}
void ConsoleCommands::on_shutdown()
{
if (m_stdin_handle) {
@ -406,4 +401,13 @@ void ConsoleCommands::process_input(std::string& command, char* data, uint32_t s
} while (true);
}
ConsoleCommands::~ConsoleCommands()
{
#ifdef DEV_TEST_SYNC
do_status(m_pool, nullptr);
#endif
shutdown_tcp();
}
} // namespace p2pool

2
src/p2pool.cpp
View File

@ -315,7 +315,7 @@ void p2pool::print_merge_mining_status() const
{
ReadLock lock(m_mergeMiningClientsLock);
for (IMergeMiningClient* client : m_mergeMiningClients) {
for (const IMergeMiningClient* client : m_mergeMiningClients) {
client->print_status();
}
}

7
src/side_chain.cpp
View File

@ -2172,15 +2172,10 @@ void SideChain::prune_old_blocks()
#ifdef DEV_TRACK_MEMORY
show_top_10_allocations();
#endif
print_status(false);
StratumServer* server1 = m_pool->stratum_server();
P2PServer* server2 = m_pool->p2p_server();
if (server1 && server2) {
server1->print_status();
server2->print_status();
server1->print_bans();
server2->print_bans();
@ -2189,8 +2184,6 @@ void SideChain::prune_old_blocks()
}
m_pool->print_hosts();
m_pool->print_merge_mining_status();
bkg_jobs_tracker.print_status();
m_pool->stop();
}
#endif