X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fdbmaintenancethread.cpp;h=e9f03e0dd68f53cbae1f8a7b2d0b361843fc0439;hb=59a5414ec47a2932a7802fcd1d98c4d80166564f;hp=0ecfeda26dc994d85bf753968c8b5155dc9c9fe3;hpb=30c26abc85a6331fecdcb6b03813710bfbc63d3f;p=fms.git

diff --git a/src/dbmaintenancethread.cpp b/src/dbmaintenancethread.cpp
index 0ecfeda..e9f03e0 100644
--- a/src/dbmaintenancethread.cpp
+++ b/src/dbmaintenancethread.cpp
@@ -22,32 +22,25 @@ DBMaintenanceThread::DBMaintenanceThread()
 	m_last1day=Poco::Timestamp();
 	m_last1day-=Poco::Timespan(0,23,51,0,0);
 
-	m_deletemessagesolderthan=180;
-	std::string tempval="180";
-	Option::Instance()->Get("DeleteMessagesOlderThan",tempval);
-	StringFunctions::Convert(tempval,m_deletemessagesolderthan);
 
-	m_messagedownloadmaxdaysbackward=5;
-	tempval="5";
-	Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);
-	StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);
 
 }
 
 
 void DBMaintenanceThread::Do10MinuteMaintenance()
 {
-	std::string ll="";
-	Option::Instance()->Get("LogLevel",ll);
+	Option option(m_db);
+	std::string ll("");
+	option.Get("LogLevel",ll);
 
 	// TODO - remove after corruption issue fixed
 	if(ll=="8")
 	{
-		std::string dbres=TestDBIntegrity();
+		std::string dbres=TestDBIntegrity(m_db);
 		m_log->trace("DBMaintenanceThread::Do10MinuteMaintenance() start TestDBIntegrity returned "+dbres);
 	}
 
-	ThreadBuilder tb;
+	ThreadBuilder tb(m_db);
 	SQLite3DB::Statement boardst=m_db->Prepare("SELECT BoardID FROM tblBoard WHERE Forum='true';");
 	// select messages for a board that aren't in a thread
 	SQLite3DB::Statement selectst=m_db->Prepare("SELECT tblMessage.MessageID FROM tblMessage \
@@ -84,7 +77,7 @@ void DBMaintenanceThread::Do10MinuteMaintenance()
 	// TODO - remove after corruption issue fixed
 	if(ll=="8")
 	{
-		std::string dbres=TestDBIntegrity();
+		std::string dbres=TestDBIntegrity(m_db);
 		m_log->trace("DBMaintenanceThread::Do10MinuteMaintenance() middle TestDBIntegrity returned "+dbres);
 	}
 
@@ -104,10 +97,13 @@ void DBMaintenanceThread::Do10MinuteMaintenance()
 		st.Step();
 	}
 
+	// delete threads that have no messages
+	m_db->Execute("DELETE FROM tblThread WHERE ThreadID IN (SELECT tblThread.ThreadID FROM tblThread LEFT JOIN tblThreadPost ON tblThread.ThreadID=tblThreadPost.ThreadID WHERE tblThreadPost.ThreadID IS NULL);");
+
 	// TODO - remove after corruption issue fixed
 	if(ll=="8")
 	{
-		std::string dbres=TestDBIntegrity();
+		std::string dbres=TestDBIntegrity(m_db);
 		m_log->trace("DBMaintenanceThread::Do10MinuteMaintenance() end TestDBIntegrity returned "+dbres);
 	}
 
@@ -122,6 +118,8 @@ void DBMaintenanceThread::Do30MinuteMaintenance()
 
 void DBMaintenanceThread::Do1HourMaintenance()
 {
+
+	m_db->Execute("BEGIN;");
 	// recalculate all trust levels - this is CPU instensive
 	// do 1 identity at a time as doing it with 1 UPDATE statement locks that database for the duration
 	SQLite3DB::Statement st=m_db->Prepare("SELECT TargetIdentityID,PeerMessageTrust,PeerTrustListTrust FROM vwCalculatedPeerTrust;");
@@ -179,12 +177,16 @@ void DBMaintenanceThread::Do1HourMaintenance()
 	// insert all identities not in trust list already
 	m_db->Execute("INSERT INTO tblIdentityTrust(LocalIdentityID,IdentityID) SELECT LocalIdentityID,IdentityID FROM tblLocalIdentity,tblIdentity WHERE LocalIdentityID || '_' || IdentityID NOT IN (SELECT LocalIdentityID || '_' || IdentityID FROM tblIdentityTrust);");
 
+	m_db->Execute("COMMIT;");
+
 	m_log->debug("PeriodicDBMaintenance::Do1HourMaintenance");
 }
 
 void DBMaintenanceThread::Do6HourMaintenance()
 {
 
+	m_db->Execute("BEGIN;");
+
 	// if we remove a board and the reply boardid is still set to it, we need to replace it with a boardid that does exist
 	SQLite3DB::Statement st=m_db->Prepare("SELECT MessageID FROM tblMessage WHERE ReplyBoardID NOT IN (SELECT BoardID FROM tblBoard);");
 	SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardID FROM tblMessageBoard WHERE MessageID=?;");
@@ -213,6 +215,8 @@ void DBMaintenanceThread::Do6HourMaintenance()
 		st.Step();
 	}
 
+	m_db->Execute("COMMIT;");
+
 	m_log->debug("PeriodicDBMaintenance::Do6HourMaintenance");
 }
 
@@ -220,6 +224,8 @@ void DBMaintenanceThread::Do1DayMaintenance()
 {
 	Poco::DateTime date;
 
+	m_db->Execute("BEGIN;");
+
 	// delete all puzzles 2 or more days old
 	date=Poco::Timestamp();
 	date-=Poco::Timespan(2,0,0,0,0);
@@ -349,6 +355,8 @@ void DBMaintenanceThread::Do1DayMaintenance()
 	m_db->Execute("DELETE FROM tblIdentityTrust WHERE LocalIdentityID NOT IN (SELECT LocalIdentityID FROM tblLocalIdentity);");
 	m_db->Execute("DELETE FROM tblIdentityTrust WHERE IdentityID NOT IN (SELECT IdentityID FROM tblIdentity);");
 
+	m_db->Execute("COMMIT;");
+
 	m_log->debug("PeriodicDBMaintenance::Do1DayMaintenance");
 
 }
@@ -357,6 +365,21 @@ void DBMaintenanceThread::run()
 {
 	m_log->debug("DBMaintenanceThread::run thread started.");
 
+	LoadDatabase();
+	Option option(m_db);
+	std::string tempval("");
+
+	m_deletemessagesolderthan=180;
+	tempval="180";
+	option.Get("DeleteMessagesOlderThan",tempval);
+	StringFunctions::Convert(tempval,m_deletemessagesolderthan);
+
+	m_messagedownloadmaxdaysbackward=5;
+	tempval="5";
+	option.Get("MessageDownloadMaxDaysBackward",tempval);
+	StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);
+
+
 	Poco::DateTime now;
 	int i=0;