version 0.1.11

[fms.git] / src / freenet / periodicdbmaintenance.cpp

diff --git a/src/freenet/periodicdbmaintenance.cpp b/src/freenet/periodicdbmaintenance.cpp
index 0febbbd..01a76c7 100644 (file)
--- a/src/freenet/periodicdbmaintenance.cpp
+++ b/src/freenet/periodicdbmaintenance.cpp
@@ -13,8 +13,9 @@ PeriodicDBMaintenance::PeriodicDBMaintenance()
        m_check1day.SetToGMTime();\r
 \r
        // set back times so they will do their first maintenance soon ( within the next hour ) - stagger so not all run at once\r
-       m_check1hour.Add(0,-45);\r
-       m_check6hours.Add(0,0,-5);\r
+       m_check30mins.Add(0,-5);\r
+       m_check1hour.Add(0,-42);\r
+       m_check6hours.Add(0,-1,-5);\r
        m_check1day.Add(0,0,-23);\r
 \r
 }\r
@@ -83,7 +84,10 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
        date.SetToGMTime();\r
        date.Add(0,0,0,-2);\r
        m_db->Execute("DELETE FROM tblTrustListInserts WHERE Day<'"+date.Format("%Y-%m-%d")+"';");\r
-       m_db->Execute("DELETE FROM tblTrustListRequests WHERE Day<'"+date.Format("%Y-%m-%d")+"';"); \r
+       m_db->Execute("DELETE FROM tblTrustListRequests WHERE Day<'"+date.Format("%Y-%m-%d")+"';");\r
+\r
+       // delete trust lists from identities we aren't trusting anymore\r
+       m_db->Execute("DELETE FROM tblPeerTrust WHERE IdentityID NOT IN (SELECT IdentityID FROM tblIdentity WHERE (LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust')) AND (PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust')));");\r
 \r
 }\r
 \r