check and remove expired masternodes on client start / more info on load/flush

Author: UdjinM6

src/init.cpp

@@ -1160,10 +1160,12 @@ bool AppInit2(boost::thread_group& threadGroup)
         CMasternodeDB mndb;
         if (!mndb.Read(mnodeman))
             LogPrintf("Invalid or missing masternodes.dat; recreating\n");
+        else
+            mnodeman.CheckAndRemove(); // clean out expired
     }
 
-    LogPrintf("Loaded %i masternodes from masternodes.dat  %dms\n",
-           mnodeman.size(), GetTimeMillis() - nStart);
+    LogPrintf("Loaded info from masternodes.dat  %dms\n", GetTimeMillis() - nStart);
+    LogPrintf("  %s\n", mnodeman.ToString());
 
 
     fMasterNode = GetBoolArg("-masternode", false);

src/masternodeman.cpp

@@ -123,7 +123,8 @@ void DumpMasternodes()
     CMasternodeDB mndb;
     mndb.Write(mnodeman);
 
-    LogPrintf("Flushed %d masternodes to masternodes.dat  %dms\n", mnodeman.size(), GetTimeMillis() - nStart);
+    LogPrintf("Flushed info to masternodes.dat  %dms\n", GetTimeMillis() - nStart);
+    LogPrintf("  %s\n", mnodeman.ToString());
 }
 
 CMasternodeMan::CMasternodeMan() {}
@@ -628,3 +629,15 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData
     }
 
 }
+
+std::string CMasternodeMan::ToString()
+{
+    std::ostringstream info;
+
+    info << "masternodes: " << (int)vMasternodes.size() <<
+            ", peers who asked us for masternode list: " << (int)mAskedUsForMasternodeList.size() <<
+            ", peers we asked for masternode list: " << (int)mWeAskedForMasternodeList.size() <<
+            ", entries in masternode list we asked for: " << (int)mWeAskedForMasternodeListEntry.size();
+
+    return info.str();
+}

src/masternodeman.h

@@ -113,6 +113,8 @@ class CMasternodeMan
     // Return the number of (unique) masternodes
     int size() { return vMasternodes.size(); }
 
+    std::string ToString();
+
 };
 
 #endif