X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistinserter.cpp;h=15399519df5aae30e320ac614b2b7dfe7ef70b4d;hp=eb943ffb0ce47b6b582d52572171412d05b5fde0;hb=HEAD;hpb=ed0732b2550c23c05fc9faf925620e87ee6dee12

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index eb943ff..1539951 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -23,10 +23,11 @@ MessageListInserter::MessageListInserter(SQLite3DB::DB *db, FCPv2::Connection *f
 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()))
+	// more than 15 minutes trying to insert - restart
+	if(m_inserting.size()>0 && (m_laststartedinsert+Poco::Timespan(0,0,15,0,0)<=Poco::DateTime()))
 	{
-		m_log->error("MessageListInserter::CheckForNeededInsert more than 10 minutes have passed without success/failure.  Clearing inserts.");
+		m_log->error("MessageListInserter::CheckForNeededInsert more than 15 minutes have passed without success/failure.  Clearing inserts.");
+		m_lastinsertedxml[m_inserting[0]]="";
 		m_inserting.clear();
 	}
 
@@ -49,7 +50,7 @@ void MessageListInserter::CheckForNeededInsert()
 		// query for identities that have messages in the past X days and (we haven't inserted lists for in the past 30 minutes OR identity has a record in tmpMessageListInsert)
 		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+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) AND tblLocalIdentity.PrivateKey IS NOT NULL AND tblLocalIdentity.PrivateKey <> '' ";
 		sql+="GROUP BY tblLocalIdentity.LocalIdentityID ";
 		sql+="ORDER BY tblLocalIdentity.LastInsertedMessageList;";
 
@@ -72,35 +73,31 @@ void MessageListInserter::CheckForNeededInsert()
 const bool MessageListInserter::HandlePutFailed(FCPv2::Message &message)
 {
 	std::vector<std::string> idparts;
-	long localidentityid;
-	long index;
+	//std::vector<std::string> uriparts;
+	long localidentityid=0;
+	long index=0;
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
+	//StringFunctions::Split(message["URI"],"/",uriparts);
+
+	StringFunctions::Convert(idparts[1],localidentityid);
+	//StringFunctions::Convert(uriparts[2],index); - URI won't be set for USKs
 
-	// non USK
-	if(idparts[0]==m_fcpuniquename)
+	if(message["Fatal"]=="true" || message["Code"]=="9")
 	{
-		StringFunctions::Convert(idparts[1],localidentityid);
-		StringFunctions::Convert(idparts[2],index);
+		SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageListInserts(LocalIdentityID,Day,InsertIndex,Inserted) VALUES(?,?,?,'false');");
+		st.Bind(0,localidentityid);
+		st.Bind(1,idparts[2]);
+		st.Bind(2,index);
+		st.Step();
+	}
 
-		if(message["Fatal"]=="true" || message["Code"]=="9")
-		{
-			SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageListInserts(LocalIdentityID,Day,InsertIndex,Inserted) VALUES(?,?,?,'false');");
-			st.Bind(0,localidentityid);
-			st.Bind(1,idparts[4]);
-			st.Bind(2,index);
-			st.Step();
-		}
+	RemoveFromInsertList(localidentityid);
 
-		RemoveFromInsertList(localidentityid);
+	// reset the last inserted xml doc to nothing so we will try to insert this one again
+	m_lastinsertedxml[localidentityid]="";
 
-		// reset the last inserted xml doc to nothing so we will try to insert this one again
-		m_lastinsertedxml[localidentityid]="";
-	}
-	else
-	{
-		m_log->debug("MessageListInserter::HandlePutFailed "+message["Identifier"]);
-	}
+	m_log->trace("MessageListInserter::HandlePutFailed insert failed for "+message["Identifier"]);
 
 	return true;
 
@@ -110,51 +107,45 @@ const bool MessageListInserter::HandlePutSuccessful(FCPv2::Message &message)
 {
 	Poco::DateTime now;
 	std::vector<std::string> idparts;
+	std::vector<std::string> uriparts;
 	long localidentityid;
 	long index;
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
+	StringFunctions::Split(message["URI"],"/",uriparts);
 
-	// non USK
-	if(idparts[0]==m_fcpuniquename)
-	{
-		StringFunctions::Convert(idparts[1],localidentityid);
-		StringFunctions::Convert(idparts[2],index);
+	StringFunctions::Convert(idparts[1],localidentityid);
+	StringFunctions::Convert(uriparts[2],index);
 
-		SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageListInserts(LocalIdentityID,Day,InsertIndex,Inserted) VALUES(?,?,?,'true');");
-		st.Bind(0,localidentityid);
-		st.Bind(1,idparts[4]);
-		st.Bind(2,index);
-		st.Step();
+	SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageListInserts(LocalIdentityID,Day,InsertIndex,Inserted) VALUES(?,?,?,'true');");
+	st.Bind(0,localidentityid);
+	st.Bind(1,idparts[2]);
+	st.Bind(2,index);
+	st.Step();
 
-		now=Poco::Timestamp();
-		st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedMessageList=? WHERE LocalIdentityID=?;");
-		st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
-		st.Bind(1,localidentityid);
-		st.Step();
+	now=Poco::Timestamp();
+	st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedMessageList=? WHERE LocalIdentityID=?;");
+	st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S"));
+	st.Bind(1,localidentityid);
+	st.Step();
 
-		// delete only a single record from tmpMessageListInsert
-		st=m_db->Prepare("SELECT MessageListInsertID FROM tmpMessageListInsert WHERE LocalIdentityID=?;");
-		st.Bind(0,localidentityid);
+	// delete only a single record from tmpMessageListInsert
+	st=m_db->Prepare("SELECT MessageListInsertID FROM tmpMessageListInsert WHERE LocalIdentityID=?;");
+	st.Bind(0,localidentityid);
+	st.Step();
+	if(st.RowReturned())
+	{
+		int id=-1;
+		st.ResultInt(0,id);
+
+		st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE MessageListInsertID=?;");
+		st.Bind(0,id);
 		st.Step();
-		if(st.RowReturned())
-		{
-			int id=-1;
-			st.ResultInt(0,id);
+	}
 
-			st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE MessageListInsertID=?;");
-			st.Bind(0,id);
-			st.Step();
-		}
+	RemoveFromInsertList(localidentityid);
 
-		RemoveFromInsertList(localidentityid);
-
-		m_log->debug("MessageListInserter::HandlePutSuccessful successfully inserted MessageList.");
-	}
-	else
-	{
-		m_log->debug("MessageListInserter::HandlePutSuccessful inserted USK MessageList "+message["Identifier"]);
-	}
+	m_log->debug("MessageListInserter::HandlePutSuccessful successfully inserted MessageList.");
 
 	return true;
 }
@@ -213,22 +204,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 175;");
+	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();
@@ -242,7 +235,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();
 	}
@@ -265,9 +266,9 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 	// only insert if the last message this identity inserted is different than this message
 	if(m_lastinsertedxml[localidentityid]!=xmlstr)
 	{
-		std::string targeturi="";
 		StringFunctions::Convert(xmlstr.size(),xmlsizestr);
 
+		/*
 		message.SetName("ClientPut");
 		message["URI"]=privatekey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|MessageList|"+indexstr+".xml";
 		message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+message["URI"];
@@ -275,11 +276,12 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 		message["DataLength"]=xmlsizestr;
 		m_fcp->Send(message);
 		m_fcp->Send(std::vector<char>(xmlstr.begin(),xmlstr.end()));
-
 		message.Clear();
+		*/
+
 		message.SetName("ClientPutComplexDir");
 		message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y.%m.%d")+"|MessageList/0/";
-		message["Identifier"]=m_fcpuniquename+"USK|"+message["URI"];
+		message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|"+message["URI"];
 		message["DefaultName"]="MessageList.xml";
 		message["Files.0.Name"]="MessageList.xml";
 		message["Files.0.UploadFrom"]="direct";
@@ -292,6 +294,8 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 
 		m_laststartedinsert=Poco::DateTime();
 
+		m_log->trace("MessageListInserter::StartInsert started insert of "+message["Identifier"]);
+
 		return true;
 	}
 	else