X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistinserter.cpp;h=2e11d8deaf9cca001bfd8edfe7917d4e4f68be91;hb=9ae3b1434e51788e6feb72e1415ec800d05c535a;hp=04ab9f30056d7b26bc61a54856d9bc08f88df9b3;hpb=4e96d123460d6363cf7274e36bd9357768eb86ad;p=fms.git

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index 04ab9f3..2e11d8d 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -10,18 +10,26 @@
 	#include <xmem.h>
 #endif
 
-MessageListInserter::MessageListInserter()
+MessageListInserter::MessageListInserter(SQLite3DB::DB *db):IIndexInserter<long>(db)
 {
 	Initialize();
 }
 
-MessageListInserter::MessageListInserter(FCPv2::Connection *fcp):IIndexInserter<long>(fcp)
+MessageListInserter::MessageListInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter<long>(db,fcp)
 {
 	Initialize();
 }
 
 void MessageListInserter::CheckForNeededInsert()
 {
+
+	// more than 10 minutes trying to insert - restart
+	if(m_inserting.size()>0 && (m_laststartedinsert+Poco::Timespan(0,0,10,0,0)<=Poco::DateTime()))
+	{
+		m_log->error("MessageListInserter::CheckForNeededInsert more than 10 minutes have passed without success/failure.  Clearing inserts.");
+		m_inserting.clear();
+	}
+
 	// only do 1 insert at a time
 	if(m_inserting.size()==0)
 	{
@@ -42,7 +50,8 @@ void MessageListInserter::CheckForNeededInsert()
 		sql="SELECT tblLocalIdentity.LocalIdentityID ";
 		sql+="FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID ";
 		sql+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) ";
-		sql+="GROUP BY tblLocalIdentity.LocalIdentityID;";
+		sql+="GROUP BY tblLocalIdentity.LocalIdentityID ";
+		sql+="ORDER BY tblLocalIdentity.LastInsertedMessageList;";
 
 		SQLite3DB::Statement st=m_db->Prepare(sql);
 		st.Bind(0,Poco::DateTimeFormatter::format(previous,"%Y-%m-%d"));
@@ -152,11 +161,12 @@ const bool MessageListInserter::HandlePutSuccessful(FCPv2::Message &message)
 
 void MessageListInserter::Initialize()
 {
-	std::string tempval;
-
+	std::string tempval("");
 	m_fcpuniquename="MessageListInserter";
 	m_daysbackward=0;
-	Option::Instance()->Get("MessageListDaysBackward",tempval);
+	Option option(m_db);
+
+	option.Get("MessageListDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_daysbackward);
 }
 
@@ -203,21 +213,24 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 	st.Finalize();
 
 
-	st=m_db->Prepare("SELECT MessageDate, MessageIndex, PublicKey, MessageID FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID WHERE MessageIndex IS NOT NULL ORDER BY MessageDate DESC, MessageTime DESC LIMIT 200;");
+	st=m_db->Prepare("SELECT MessageDate, MessageIndex, PublicKey, MessageID, InsertDate FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID WHERE MessageIndex IS NOT NULL ORDER BY MessageDate DESC, MessageTime DESC LIMIT 175;");
 	SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=?;");
 	st.Step();
+
 	while(st.RowReturned())
 	{
-		std::string day;
-		int index;
-		std::string publickey;
+		std::string day="";
+		int index=0;
+		std::string publickey="";
 		std::vector<std::string> boardlist;
-		int messageid;
+		int messageid=0;
+		std::string insertdate="";
 		
 		st.ResultText(0,day);
 		st.ResultInt(1,index);
 		st.ResultText(2,publickey);
 		st.ResultInt(3,messageid);
+		st.ResultText(4,insertdate);
 
 		st2.Bind(0,messageid);
 		st2.Step();
@@ -231,7 +244,15 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 		}
 		st2.Reset();
 
-		mlxml.AddExternalMessage(publickey,day,index,boardlist);
+		// TODO - remove insertdate empty check sometime after 0.3.32 release and get rid of using day
+		if(insertdate!="")
+		{
+			mlxml.AddExternalMessage(publickey,insertdate,index,boardlist);
+		}
+		else
+		{
+			mlxml.AddExternalMessage(publickey,day,index,boardlist);
+		}
 
 		st.Step();
 	}
@@ -279,10 +300,19 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 		m_inserting.push_back(localidentityid);
 		m_lastinsertedxml[localidentityid]=xmlstr;
 
+		m_laststartedinsert=Poco::DateTime();
+
 		return true;
 	}
 	else
 	{
+
+		// xml was the same one that we inserted 30 minutes ago, reset date so we don't continue checking every minute
+		st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedMessageList=? WHERE LocalIdentityID=?;");
+		st.Bind(0,Poco::DateTimeFormatter::format(Poco::DateTime(),"%Y-%m-%d %H:%M:%S"));
+		st.Bind(1,localidentityid);
+		st.Step();
+
 		return false;
 	}