sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 13:03:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/v0.11.2.x' into v0.11.2.x

Browse Source
This commit is contained in:
snogcel 2015-03-01 00:52:57 -07:00
commit 4a8f81c0e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/masternodeman.cpp
View File

@ -123,8 +123,7 @@ void DumpMasternodes()
CMasternodeDB mndb;
mndb.Write(mnodeman);
LogPrint("masternode", "Flushed %d masternodes to masternodes.dat %dms\n",
mnodeman.size(), GetTimeMillis() - nStart);
LogPrintf("Flushed %d masternodes to masternodes.dat %dms\n", mnodeman.size(), GetTimeMillis() - nStart);
}
CMasternodeMan::CMasternodeMan() {}
@ -140,6 +139,7 @@ bool CMasternodeMan::Add(CMasternode &mn)
if (pmn == NULL)
{
LogPrintf("CMasternodeMan: Adding new masternode %s\n", mn.addr.ToString().c_str());
vMasternodes.push_back(mn);
return true;
}
@ -165,7 +165,7 @@ void CMasternodeMan::CheckAndRemove()
vector<CMasternode>::iterator it = vMasternodes.begin();
while(it != vMasternodes.end()){
if((*it).activeState == 4 || (*it).activeState == 3){
LogPrintf("Removing inactive masternode %s\n", (*it).addr.ToString().c_str());
LogPrintf("CMasternodeMan: Removing inactive masternode %s\n", (*it).addr.ToString().c_str());
it = vMasternodes.erase(it);
} else {
++it;
@ -576,7 +576,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
LogPrintf("dseep - Asking source node for missing entry %s\n", vin.ToString().c_str());
pfrom->PushMessage("dseg", vin);
int64_t askAgain = GetTime()+(60*60*24);
int64_t askAgain = GetTime() + MASTERNODE_MIN_DSEEP_SECONDS;
mWeAskedForMasternodeListEntry[vin.prevout] = askAgain;
} else if (strCommand == "dseg") { //Get masternode list or specific entry