X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistinserter.cpp;h=2e11d8deaf9cca001bfd8edfe7917d4e4f68be91;hb=9ae3b1434e51788e6feb72e1415ec800d05c535a;hp=9307b19272ca6c198cccdc7e20fe1fcf1d997be0;hpb=dec33c63afafabf83c3039e916725cac6faef9b3;p=fms.git diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp index 9307b19..2e11d8d 100644 --- a/src/freenet/messagelistinserter.cpp +++ b/src/freenet/messagelistinserter.cpp @@ -10,18 +10,26 @@ #include #endif -MessageListInserter::MessageListInserter() +MessageListInserter::MessageListInserter(SQLite3DB::DB *db):IIndexInserter(db) { Initialize(); } -MessageListInserter::MessageListInserter(FCPv2 *fcp):IIndexInserter(fcp) +MessageListInserter::MessageListInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter(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")); @@ -60,7 +69,7 @@ void MessageListInserter::CheckForNeededInsert() } -const bool MessageListInserter::HandlePutFailed(FCPMessage &message) +const bool MessageListInserter::HandlePutFailed(FCPv2::Message &message) { std::vector idparts; long localidentityid; @@ -97,7 +106,7 @@ const bool MessageListInserter::HandlePutFailed(FCPMessage &message) } -const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message) +const bool MessageListInserter::HandlePutSuccessful(FCPv2::Message &message) { Poco::DateTime now; std::vector idparts; @@ -124,10 +133,19 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message) st.Bind(1,localidentityid); st.Step(); - // delete any record from tmpMessageListInsert - st=m_db->Prepare("DELETE FROM tmpMessageListInsert WHERE 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(); + } RemoveFromInsertList(localidentityid); @@ -143,17 +161,18 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &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); } const bool MessageListInserter::StartInsert(const long &localidentityid) { - FCPMessage message; + FCPv2::Message message; Poco::DateTime date; Poco::DateTime now; std::string privatekey; @@ -168,7 +187,7 @@ const bool MessageListInserter::StartInsert(const long &localidentityid) date-=Poco::Timespan(m_daysbackward,0,0,0,0); StringFunctions::Convert(localidentityid,localidentityidstr); - SQLite3DB::Statement st=m_db->Prepare("SELECT Day, InsertIndex, MessageXML, PrivateKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.LocalIdentityID=? AND Day>=?;"); + SQLite3DB::Statement st=m_db->Prepare("SELECT Day, InsertIndex, MessageXML, PrivateKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.LocalIdentityID=? AND Day>=? AND tblMessageInserts.MessageUUID IS NOT NULL;"); st.Bind(0,localidentityid); st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d")); st.Step(); @@ -194,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 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(); @@ -222,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(); } @@ -253,10 +283,10 @@ const bool MessageListInserter::StartInsert(const long &localidentityid) message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+message["URI"]; message["UploadFrom"]="direct"; message["DataLength"]=xmlsizestr; - m_fcp->SendMessage(message); - m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size()); + m_fcp->Send(message); + m_fcp->Send(std::vector(xmlstr.begin(),xmlstr.end())); - message.Reset(); + 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"]; @@ -264,16 +294,25 @@ const bool MessageListInserter::StartInsert(const long &localidentityid) message["Files.0.Name"]="MessageList.xml"; message["Files.0.UploadFrom"]="direct"; message["Files.0.DataLength"]=xmlsizestr; - m_fcp->SendMessage(message); - m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size()); + m_fcp->Send(message); + m_fcp->Send(std::vector(xmlstr.begin(),xmlstr.end())); 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; }