X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fperiodicdbmaintenance.cpp;h=01a76c7dd1087dfa67db052ac2eba870512c30cb;hp=0febbbd736f6210ff8a1ecedf89fe8cec2008e12;hb=df316253862dc50e8e5a790d9634ef90be37badb;hpb=f60495a029c54358f82956482fe203fe2b7b5b23

diff --git a/src/freenet/periodicdbmaintenance.cpp b/src/freenet/periodicdbmaintenance.cpp
index 0febbbd..01a76c7 100644
--- a/src/freenet/periodicdbmaintenance.cpp
+++ b/src/freenet/periodicdbmaintenance.cpp
@@ -13,8 +13,9 @@ PeriodicDBMaintenance::PeriodicDBMaintenance()
 	m_check1day.SetToGMTime();
 
 	// set back times so they will do their first maintenance soon ( within the next hour ) - stagger so not all run at once
-	m_check1hour.Add(0,-45);
-	m_check6hours.Add(0,0,-5);
+	m_check30mins.Add(0,-5);
+	m_check1hour.Add(0,-42);
+	m_check6hours.Add(0,-1,-5);
 	m_check1day.Add(0,0,-23);
 
 }
@@ -83,7 +84,10 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 	date.SetToGMTime();
 	date.Add(0,0,0,-2);
 	m_db->Execute("DELETE FROM tblTrustListInserts WHERE Day<'"+date.Format("%Y-%m-%d")+"';");
-	m_db->Execute("DELETE FROM tblTrustListRequests WHERE Day<'"+date.Format("%Y-%m-%d")+"';"); 
+	m_db->Execute("DELETE FROM tblTrustListRequests WHERE Day<'"+date.Format("%Y-%m-%d")+"';");
+
+	// delete trust lists from identities we aren't trusting anymore
+	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')));");
 
 }