diff --git a/src/net.cpp b/src/net.cpp --- a/src/net.cpp +++ b/src/net.cpp @@ -38,8 +38,11 @@ #include -// Dump addresses to peers.dat and banlist.dat every 15 minutes (900s) -#define DUMP_ADDRESSES_INTERVAL 900 +// Dump addresses to peers.dat every 15 minutes (900s) +static constexpr int DUMP_PEERS_INTERVAL = 15 * 60; + +// Dump addresses to banlist.dat every 15 minutes (900s) +static constexpr int DUMP_BANS_INTERVAL = 60 * 15; // We add a random period time (0 to 1 seconds) to feeler connections to prevent // synchronization. @@ -1767,11 +1770,6 @@ addrman.size(), GetTimeMillis() - nStart); } -void CConnman::DumpData() { - DumpAddresses(); - DumpBanlist(); -} - void CConnman::ProcessOneShot() { std::string strDest; { @@ -2547,10 +2545,17 @@ // Dump network addresses scheduler.scheduleEvery( [this]() { - this->DumpData(); + this->DumpAddresses(); + return true; + }, + DUMP_PEERS_INTERVAL * 1000); + + scheduler.scheduleEvery( + [this]() { + this->DumpBanlist(); return true; }, - DUMP_ADDRESSES_INTERVAL * 1000); + DUMP_BANS_INTERVAL * 1000); return true; } @@ -2608,7 +2613,8 @@ } if (fAddressesInitialized) { - DumpData(); + DumpAddresses(); + DumpBanlist(); fAddressesInitialized = false; }