X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistinserter.cpp;h=2e11d8deaf9cca001bfd8edfe7917d4e4f68be91;hb=9ae3b1434e51788e6feb72e1415ec800d05c535a;hp=eb102a13bfe7e78cdf0d36dac8c348de0b442368;hpb=853f67b0b7b8121d572cff34d40f7b28cac8f65e;p=fms.git diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp index eb102a1..2e11d8d 100644 --- a/src/freenet/messagelistinserter.cpp +++ b/src/freenet/messagelistinserter.cpp @@ -2,50 +2,60 @@ #include "../../include/freenet/messagexml.h" #include "../../include/freenet/messagelistxml.h" +#include +#include +#include + #ifdef XMEM #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) { std::string sql; - DateTime now; - DateTime previous; + Poco::DateTime now; + Poco::DateTime previous; bool startedinsert=false; - now.SetToGMTime(); - previous.SetToGMTime(); - // reset the last inserted xml doc to nothing if the day has changed - if(m_lastchecked.GetDay()!=now.GetDay()) + if(m_lastchecked.day()!=now.day()) { m_lastinsertedxml.clear(); } - previous.Add(0,0,0,-m_daysbackward); + previous-=Poco::Timespan(m_daysbackward,0,0,0,0); // 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+="GROUP BY tblLocalIdentity.LocalIdentityID;"; + sql+="GROUP BY tblLocalIdentity.LocalIdentityID "; + sql+="ORDER BY tblLocalIdentity.LastInsertedMessageList;"; SQLite3DB::Statement st=m_db->Prepare(sql); - st.Bind(0,previous.Format("%Y-%m-%d")); - st.Bind(1,(now-(1.0/48.0)).Format("%Y-%m-%d %H:%M:%S")); + st.Bind(0,Poco::DateTimeFormatter::format(previous,"%Y-%m-%d")); + st.Bind(1,Poco::DateTimeFormatter::format((now-Poco::Timespan(0,0,30,0,0)),"%Y-%m-%d %H:%M:%S")); st.Step(); while(st.RowReturned() && startedinsert==false) @@ -59,7 +69,7 @@ void MessageListInserter::CheckForNeededInsert() } -const bool MessageListInserter::HandlePutFailed(FCPMessage &message) +const bool MessageListInserter::HandlePutFailed(FCPv2::Message &message) { std::vector idparts; long localidentityid; @@ -89,16 +99,16 @@ const bool MessageListInserter::HandlePutFailed(FCPMessage &message) } else { - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutFailed "+message["Identifier"]); + m_log->debug("MessageListInserter::HandlePutFailed "+message["Identifier"]); } return true; } -const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message) +const bool MessageListInserter::HandlePutSuccessful(FCPv2::Message &message) { - DateTime now; + Poco::DateTime now; std::vector idparts; long localidentityid; long index; @@ -117,24 +127,33 @@ const bool MessageListInserter::HandlePutSuccessful(FCPMessage &message) st.Bind(2,index); st.Step(); - now.SetToGMTime(); + now=Poco::Timestamp(); st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedMessageList=? WHERE LocalIdentityID=?;"); - st.Bind(0,now.Format("%Y-%m-%d %H:%M:%S")); + st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")); 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); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutSuccessful successfully inserted MessageList."); + m_log->debug("MessageListInserter::HandlePutSuccessful successfully inserted MessageList."); } else { - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageListInserter::HandlePutSuccessful inserted USK MessageList "+message["Identifier"]); + m_log->debug("MessageListInserter::HandlePutSuccessful inserted USK MessageList "+message["Identifier"]); } return true; @@ -142,19 +161,20 @@ 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; - DateTime date; - DateTime now; + FCPv2::Message message; + Poco::DateTime date; + Poco::DateTime now; std::string privatekey; std::string localidentityidstr; MessageListXML mlxml; @@ -164,14 +184,12 @@ const bool MessageListInserter::StartInsert(const long &localidentityid) int index; std::string indexstr; - now.SetToGMTime(); - date.SetToGMTime(); - date.Add(0,0,0,-m_daysbackward); + 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,date.Format("%Y-%m-%d")); + st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d")); st.Step(); while(st.RowReturned()) @@ -195,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(); @@ -223,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(); } @@ -232,7 +261,7 @@ const bool MessageListInserter::StartInsert(const long &localidentityid) index=0; st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageListInserts WHERE LocalIdentityID=? AND Day=?;"); st.Bind(0,localidentityid); - st.Bind(1,now.Format("%Y-%m-%d")); + st.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d")); st.Step(); if(st.ResultNull(0)==false) { @@ -250,31 +279,40 @@ const bool MessageListInserter::StartInsert(const long &localidentityid) StringFunctions::Convert(xmlstr.size(),xmlsizestr); message.SetName("ClientPut"); - message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml"; + message["URI"]=privatekey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|MessageList|"+indexstr+".xml"; 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+"|"+now.Format("%Y.%m.%d")+"|MessageList/0/"; + 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["DefaultName"]="MessageList.xml"; 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; }