Skip to content

Change logging for budgets a bit #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eduffield222 merged 2 commits into from
Apr 6, 2016
Merged

Change logging for budgets a bit #757

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3771036
move some messages to mnbudget debug category
UdjinM6 Jan 23, 2016
4cd7689
more verbose logging for CBudgetManager::NewBlock and CBudgetManager:…
UdjinM6 Apr 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/masternode-budget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,29 +392,35 @@ bool CBudgetManager::AddProposal(CBudgetProposal& budgetProposal)

void CBudgetManager::CheckAndRemove()
{
LogPrintf("CBudgetManager::CheckAndRemove \n");
LogPrintf("CBudgetManager::CheckAndRemove\n");

std::string strError = "";

LogPrintf("CBudgetManager::CheckAndRemove - mapFinalizedBudgets cleanup - size: %d\n", mapFinalizedBudgets.size());
std::map<uint256, CFinalizedBudget>::iterator it = mapFinalizedBudgets.begin();
while(it != mapFinalizedBudgets.end())
{
CFinalizedBudget* pfinalizedBudget = &((*it).second);

pfinalizedBudget->fValid = pfinalizedBudget->IsValid(strError);
LogPrintf("CBudgetManager::CheckAndRemove - pfinalizedBudget->IsValid - strError: %s\n", strError);
if(pfinalizedBudget->fValid) {
pfinalizedBudget->AutoCheck();
}

++it;
}

LogPrintf("CBudgetManager::CheckAndRemove - mapProposals cleanup - size: %d\n", mapProposals.size());
std::map<uint256, CBudgetProposal>::iterator it2 = mapProposals.begin();
while(it2 != mapProposals.end())
{
CBudgetProposal* pbudgetProposal = &((*it2).second);
pbudgetProposal->fValid = pbudgetProposal->IsValid(strError);
++it2;
}

LogPrintf("CBudgetManager::CheckAndRemove - PASSED\n");
}

void CBudgetManager::FillBlockPayee(CMutableTransaction& txNew, CAmount nFees)
Expand Down Expand Up @@ -804,6 +810,7 @@ void CBudgetManager::NewBlock()

//remove invalid votes once in a while (we have to check the signatures and validity of every vote, somewhat CPU intensive)

LogPrintf("CBudgetManager::NewBlock - askedForSourceProposalOrBudget cleanup - size: %d\n", askedForSourceProposalOrBudget.size());
std::map<uint256, int64_t>::iterator it = askedForSourceProposalOrBudget.begin();
while(it != askedForSourceProposalOrBudget.end()){
if((*it).second > GetTime() - (60*60*24)){
Expand All @@ -813,18 +820,21 @@ void CBudgetManager::NewBlock()
}
}

LogPrintf("CBudgetManager::NewBlock - mapProposals cleanup - size: %d\n", mapProposals.size());
std::map<uint256, CBudgetProposal>::iterator it2 = mapProposals.begin();
while(it2 != mapProposals.end()){
(*it2).second.CleanAndRemove(false);
++it2;
}

LogPrintf("CBudgetManager::NewBlock - mapFinalizedBudgets cleanup - size: %d\n", mapFinalizedBudgets.size());
std::map<uint256, CFinalizedBudget>::iterator it3 = mapFinalizedBudgets.begin();
while(it3 != mapFinalizedBudgets.end()){
(*it3).second.CleanAndRemove(false);
++it3;
}

LogPrintf("CBudgetManager::NewBlock - vecImmatureBudgetProposals cleanup - size: %d\n", vecImmatureBudgetProposals.size());
std::vector<CBudgetProposalBroadcast>::iterator it4 = vecImmatureBudgetProposals.begin();
while(it4 != vecImmatureBudgetProposals.end())
{
Expand All @@ -848,6 +858,7 @@ void CBudgetManager::NewBlock()
it4 = vecImmatureBudgetProposals.erase(it4);
}

LogPrintf("CBudgetManager::NewBlock - vecImmatureFinalizedBudgets cleanup - size: %d\n", vecImmatureFinalizedBudgets.size());
std::vector<CFinalizedBudgetBroadcast>::iterator it5 = vecImmatureFinalizedBudgets.begin();
while(it5 != vecImmatureFinalizedBudgets.end())
{
Expand All @@ -871,7 +882,7 @@ void CBudgetManager::NewBlock()

it5 = vecImmatureFinalizedBudgets.erase(it5);
}

LogPrintf("CBudgetManager::NewBlock - PASSED\n");
}

void CBudgetManager::ProcessMessage(CNode* pfrom, std::string& strCommand, CDataStream& vRecv)
Expand Down Expand Up @@ -1572,7 +1583,7 @@ bool CBudgetVote::SignatureValid(bool fSignatureCheck)

if(pmn == NULL)
{
LogPrintf("CBudgetVote::SignatureValid() - Unknown Masternode - %s\n", vin.ToString());
LogPrint("mnbudget", "CBudgetVote::SignatureValid() - Unknown Masternode - %s\n", vin.ToString());
return false;
}

Expand Down Expand Up @@ -1974,7 +1985,7 @@ bool CFinalizedBudgetVote::SignatureValid(bool fSignatureCheck)

if(pmn == NULL)
{
LogPrintf("CFinalizedBudgetVote::SignatureValid() - Unknown Masternode\n");
LogPrint("mnbudget", "CFinalizedBudgetVote::SignatureValid() - Unknown Masternode\n");
return false;
}

Expand Down