X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessageinserter.cpp;h=4dc0419a42159117f5eea0f7d7364badd231fb10;hb=9ae3b1434e51788e6feb72e1415ec800d05c535a;hp=3dc1203cf4b2e3f11bd21429864690f2fb867eb7;hpb=9a14c0d9f7f7c319e539583b93664953764e83b7;p=fms.git diff --git a/src/freenet/messageinserter.cpp b/src/freenet/messageinserter.cpp index 3dc1203..4dc0419 100644 --- a/src/freenet/messageinserter.cpp +++ b/src/freenet/messageinserter.cpp @@ -1,23 +1,29 @@ #include "../../include/freenet/messageinserter.h" #include "../../include/freenet/messagexml.h" -MessageInserter::MessageInserter() +#include +#include +#include + +MessageInserter::MessageInserter(SQLite3DB::DB *db):IIndexInserter(db) { Initialize(); } -MessageInserter::MessageInserter(FCPv2 *fcp):IIndexInserter(fcp) +MessageInserter::MessageInserter(SQLite3DB::DB *db, FCPv2::Connection *fcp):IIndexInserter(db,fcp) { Initialize(); } void MessageInserter::CheckForNeededInsert() { + Poco::DateTime now; bool didinsert=false; // only do 1 insert at a time if(m_inserting.size()==0) { - SQLite3DB::Statement st=m_db->Prepare("SELECT MessageUUID FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.PrivateKey IS NOT NULL AND tblLocalIdentity.PrivateKey <> '' AND tblMessageInserts.Inserted='false';"); + SQLite3DB::Statement st=m_db->Prepare("SELECT MessageUUID FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE tblLocalIdentity.PrivateKey IS NOT NULL AND tblLocalIdentity.PrivateKey <> '' AND tblMessageInserts.Inserted='false' AND tblMessageInserts.SendDate<=?;"); + st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")); st.Step(); while(st.RowReturned() && m_inserting.size()==0) @@ -40,82 +46,105 @@ void MessageInserter::CheckForNeededInsert() } } -const bool MessageInserter::HandlePutFailed(FCPMessage &message) +const bool MessageInserter::HandlePutFailed(FCPv2::Message &message) { int index; int localidentityid; std::vector idparts; - StringFunctions::Split(message["Identifier"],"|",idparts); - StringFunctions::Convert(idparts[2],localidentityid); - StringFunctions::Convert(idparts[3],index); - // fatal put - or data exists - insert bogus index into database so we'll try to insert this message again - if(message["Fatal"]=="true" || message["Code"]=="9") + // do check to make sure this is the non-editioned SSK - we ignore failure/success for editioned SSK for now + if(message["Identifier"].find(".xml")!=std::string::npos) { - SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,Day,InsertIndex,Inserted) VALUES(?,?,?,'true');"); - st.Bind(0,localidentityid); - st.Bind(1,idparts[6]); - st.Bind(2,index); - st.Step(); - } - RemoveFromInsertList(idparts[1]); + StringFunctions::Split(message["Identifier"],"|",idparts); + StringFunctions::Convert(idparts[2],localidentityid); + StringFunctions::Convert(idparts[3],index); + + // fatal put - or data exists - insert bogus index into database so we'll try to insert this message again + if(message["Fatal"]=="true" || message["Code"]=="9") + { + SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,Day,InsertIndex,Inserted) VALUES(?,?,?,'true');"); + st.Bind(0,localidentityid); + st.Bind(1,idparts[6]); + st.Bind(2,index); + st.Step(); + } + + m_log->trace("MessageInserter::HandlePutFailed error code "+message["Code"]+" fatal="+message["Fatal"]); + + RemoveFromInsertList(idparts[1]); + + } + else + { + m_log->trace("MessageInserter::HandlePutFailed for editioned SSK error code "+message["Code"]+ " id "+message["Identifier"]); + } return true; } -const bool MessageInserter::HandlePutSuccessful(FCPMessage &message) +const bool MessageInserter::HandlePutSuccessful(FCPv2::Message &message) { MessageXML xml; - DateTime date; + Poco::DateTime date; int localidentityid; int index; std::vector idparts; - StringFunctions::Split(message["Identifier"],"|",idparts); - StringFunctions::Convert(idparts[3],index); - StringFunctions::Convert(idparts[2],localidentityid); + // do check to make sure this is the non-editioned SSK - we ignore failure/success for editioned SSK for now + if(message["Identifier"].find(".xml")!=std::string::npos) + { - SQLite3DB::Statement st=m_db->Prepare("UPDATE tblMessageInserts SET Day=?, InsertIndex=?, Inserted='true' WHERE MessageUUID=?;"); - st.Bind(0,idparts[6]); - st.Bind(1,index); - st.Bind(2,idparts[1]); - st.Step(); + StringFunctions::Split(message["Identifier"],"|",idparts); + StringFunctions::Convert(idparts[3],index); + StringFunctions::Convert(idparts[2],localidentityid); - // insert record into temp table so MessageList will be inserted ASAP - date.SetToGMTime(); - st=m_db->Prepare("INSERT INTO tmpMessageListInsert(LocalIdentityID,Date) VALUES(?,?);"); - st.Bind(0,localidentityid); - st.Bind(1,date.Format("%Y-%m-%d")); - st.Step(); + SQLite3DB::Statement st=m_db->Prepare("UPDATE tblMessageInserts SET Day=?, InsertIndex=?, Inserted='true' WHERE MessageUUID=?;"); + st.Bind(0,idparts[6]); + st.Bind(1,index); + st.Bind(2,idparts[1]); + st.Step(); - // update the messageuuid to the real messageuuid - st=m_db->Prepare("SELECT MessageXML FROM tblMessageInserts WHERE MessageUUID=?;"); - st.Bind(0,idparts[1]); - st.Step(); - if(st.RowReturned()) - { - std::string xmldata=""; - st.ResultText(0,xmldata); - xml.ParseXML(xmldata); - xml.SetMessageID(idparts[4]); - - SQLite3DB::Statement st2=m_db->Prepare("UPDATE tblMessageInserts SET MessageUUID=?, MessageXML=? WHERE MessageUUID=?;"); - st2.Bind(0,idparts[4]); - st2.Bind(1,xml.GetXML()); - st2.Bind(2,idparts[1]); - st2.Step(); - - //update file insert MessageUUID as well - st2=m_db->Prepare("UPDATE tblFileInserts SET MessageUUID=? WHERE MessageUUID=?;"); - st2.Bind(0,idparts[4]); - st2.Bind(1,idparts[1]); - st2.Step(); - } + // insert record into temp table so MessageList will be inserted ASAP + date=Poco::Timestamp(); + st=m_db->Prepare("INSERT INTO tmpMessageListInsert(LocalIdentityID,Date) VALUES(?,?);"); + st.Bind(0,localidentityid); + st.Bind(1,Poco::DateTimeFormatter::format(date,"%Y-%m-%d")); + st.Step(); + + // update the messageuuid to the real messageuuid + st=m_db->Prepare("SELECT MessageXML FROM tblMessageInserts WHERE MessageUUID=?;"); + st.Bind(0,idparts[1]); + st.Step(); + if(st.RowReturned()) + { + std::string xmldata=""; + st.ResultText(0,xmldata); + xml.ParseXML(xmldata); + xml.SetMessageID(idparts[4]); + + SQLite3DB::Statement st2=m_db->Prepare("UPDATE tblMessageInserts SET MessageUUID=?, MessageXML=? WHERE MessageUUID=?;"); + st2.Bind(0,idparts[4]); + st2.Bind(1,xml.GetXML()); + st2.Bind(2,idparts[1]); + st2.Step(); + + //update file insert MessageUUID as well + st2=m_db->Prepare("UPDATE tblFileInserts SET MessageUUID=? WHERE MessageUUID=?;"); + st2.Bind(0,idparts[4]); + st2.Bind(1,idparts[1]); + st2.Step(); + } + + RemoveFromInsertList(idparts[1]); - RemoveFromInsertList(idparts[1]); + m_log->debug("MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::HandlePutSuccessful successfully inserted message "+message["Identifier"]); + } + else + { + m_log->debug("MessageInserter::HandlePutSuccessful for editioned SSK "+message["Identifier"]); + } return true; } @@ -128,8 +157,7 @@ void MessageInserter::Initialize() const bool MessageInserter::StartInsert(const std::string &messageuuid) { MessageXML xmlfile; - DateTime now; - now.SetToGMTime(); + Poco::DateTime now; SQLite3DB::Statement st=m_db->Prepare("SELECT MessageXML,PrivateKey,tblLocalIdentity.LocalIdentityID,PublicKey FROM tblMessageInserts INNER JOIN tblLocalIdentity ON tblMessageInserts.LocalIdentityID=tblLocalIdentity.LocalIdentityID WHERE MessageUUID=?;"); st.Bind(0,messageuuid); st.Step(); @@ -142,7 +170,7 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid) std::string xmlsizestr; std::string privatekey; std::string publickey; - FCPMessage message; + FCPv2::Message message; std::string indexstr; int index=0; @@ -153,7 +181,7 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid) StringFunctions::Convert(localidentityid,idstr); st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageInserts WHERE Day=? AND LocalIdentityID=?;"); - st.Bind(0,now.Format("%Y-%m-%d")); + st.Bind(0,Poco::DateTimeFormatter::format(now,"%Y-%m-%d")); st.Bind(1,localidentityid); st.Step(); @@ -197,16 +225,26 @@ const bool MessageInserter::StartInsert(const std::string &messageuuid) StringFunctions::Convert(xml.size(),xmlsizestr); message.SetName("ClientPut"); - message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|Message|"+indexstr+".xml"; + message["URI"]=privatekey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|Message|"+indexstr+".xml"; message["Identifier"]=m_fcpuniquename+"|"+messageuuid+"|"+idstr+"|"+indexstr+"|"+xmlfile.GetMessageID()+"|"+message["URI"]; message["UploadFrom"]="direct"; message["DataLength"]=xmlsizestr; - m_fcp->SendMessage(message); - m_fcp->SendRaw(xml.c_str(),xml.size()); + m_fcp->Send(message); + m_fcp->Send(std::vector(xml.begin(),xml.end())); + + // test insert as editioned SSK + message.Clear(); + message.SetName("ClientPut"); + message["URI"]=privatekey+m_messagebase+"|"+Poco::DateTimeFormatter::format(now,"%Y-%m-%d")+"|Message-"+indexstr; + message["Identifier"]=m_fcpuniquename+"|"+message["URI"]; + message["UploadFrom"]="direct"; + message["DataLength"]=xmlsizestr; + m_fcp->Send(message); + m_fcp->Send(std::vector(xml.begin(),xml.end())); m_inserting.push_back(messageuuid); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageInserter::StartInsert started message insert "+message["URI"]); + m_log->debug("MessageInserter::StartInsert started message insert "+message["URI"]); return true; }