X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=ea3ec858540aa6220969c8db54c31189f83fef40;hp=5c95cdbbcdb9da3eb2e1123f14bf15e8a4dd4aa5;hb=dec33c63afafabf83c3039e916725cac6faef9b3;hpb=9b22dd53fe62e312c1647310b7ec43aa127090af diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp index 5c95cdb..ea3ec85 100644 --- a/src/freenet/messagerequester.cpp +++ b/src/freenet/messagerequester.cpp @@ -3,6 +3,10 @@ #include +#include +#include +#include + #ifdef XMEM #include #endif @@ -33,11 +37,10 @@ const long MessageRequester::GetBoardID(const std::string &boardname, const std: } else { - DateTime now; - now.SetToGMTime(); + Poco::DateTime now; st=m_db->Prepare("INSERT INTO tblBoard(BoardName,DateAdded,SaveReceivedMessages,AddedMethod) VALUES(?,?,?,?);"); st.Bind(0,boardname); - st.Bind(1,now.Format("%Y-%m-%d %H:%M:%S")); + st.Bind(1,Poco::DateTimeFormatter::format(now,"%Y-%m-%d %H:%M:%S")); if(m_savemessagesfromnewboards) { st.Bind(2,"true"); @@ -137,14 +140,14 @@ const bool MessageRequester::HandleAllData(FCPMessage &message) if(boards.size()<=0) { - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain any boards! "+message["Identifier"]); + m_log->error("MessageRequester::HandleAllData Message XML did not contain any boards! "+message["Identifier"]); // remove this identityid from request list RemoveFromRequestList(idparts[1]); return true; } if(xml.GetReplyBoard()=="") { - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Message XML did not contain a reply board! "+message["Identifier"]); + m_log->error("MessageRequester::HandleAllData Message XML did not contain a reply board! "+message["Identifier"]); // remove this identityid from request list RemoveFromRequestList(idparts[1]); return true; @@ -178,19 +181,19 @@ const bool MessageRequester::HandleAllData(FCPMessage &message) keypart=StringFunctions::Replace(StringFunctions::Replace(keyparts[1],"-",""),"~",""); if(keypart!=uuidparts[1]) { - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData MessageID in Message doesn't match public key of identity : "+message["Identifier"]); + m_log->error("MessageRequester::HandleAllData MessageID in Message doesn't match public key of identity : "+message["Identifier"]); validmessage=false; } } else { - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Error with identity's public key or Message ID : "+message["Identifier"]); + m_log->error("MessageRequester::HandleAllData Error with identity's public key or Message ID : "+message["Identifier"]); validmessage=false; } } else { - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData Error couldn't find identity : "+message["Identifier"]); + m_log->error("MessageRequester::HandleAllData Error couldn't find identity : "+message["Identifier"]); validmessage=false; } @@ -265,7 +268,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message) } st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::HandleAllData parsed Message XML file : "+message["Identifier"]); + m_log->debug("MessageRequester::HandleAllData parsed Message XML file : "+message["Identifier"]); } else // couldn't insert - was already in database @@ -277,7 +280,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message) } else { - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleAllData error parsing Message XML file : "+message["Identifier"]); + m_log->error("MessageRequester::HandleAllData error parsing Message XML file : "+message["Identifier"]); } RemoveFromRequestList(idparts[1]); @@ -287,14 +290,12 @@ const bool MessageRequester::HandleAllData(FCPMessage &message) const bool MessageRequester::HandleGetFailed(FCPMessage &message) { - DateTime now; SQLite3DB::Statement st; std::vector idparts; std::string requestid; long index; long identityid; - now.SetToGMTime(); StringFunctions::Split(message["Identifier"],"|",idparts); requestid=idparts[1]; StringFunctions::Convert(idparts[2],identityid); @@ -310,7 +311,7 @@ const bool MessageRequester::HandleGetFailed(FCPMessage &message) st.Step(); st.Finalize(); - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"MessageRequester::HandleGetFailed fatal error requesting "+message["Identifier"]); + m_log->error("MessageRequester::HandleGetFailed fatal error requesting "+message["Identifier"]); } // remove this identityid from request list @@ -328,44 +329,44 @@ void MessageRequester::Initialize() if(m_maxrequests<1) { m_maxrequests=1; - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxMessageRequests is currently set at "+tempval+". It must be 1 or greater."); + m_log->error("Option MaxMessageRequests is currently set at "+tempval+". It must be 1 or greater."); } if(m_maxrequests>100) { - m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageRequests is currently set at "+tempval+". This value might be incorrectly configured."); + m_log->warning("Option MaxMessageRequests is currently set at "+tempval+". This value might be incorrectly configured."); } Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval); StringFunctions::Convert(tempval,m_maxdaysbackward); if(m_maxdaysbackward<0) { m_maxdaysbackward=0; - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MessageDownloadMaxDaysBackward is currently set at "+tempval+". It must be 0 or greater."); + m_log->error("Option MessageDownloadMaxDaysBackward is currently set at "+tempval+". It must be 0 or greater."); } if(m_maxdaysbackward>30) { - m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MessageDownloadMaxDaysBackward is currently set at "+tempval+". This value might be incorrectly configured."); + m_log->warning("Option MessageDownloadMaxDaysBackward is currently set at "+tempval+". This value might be incorrectly configured."); } Option::Instance()->Get("MaxPeerMessagesPerDay",tempval); StringFunctions::Convert(tempval,m_maxpeermessages); if(m_maxpeermessages<1) { m_maxpeermessages=1; - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxPeerMessagesPerDay is currently set at "+tempval+". It must be 1 or greater."); + m_log->error("Option MaxPeerMessagesPerDay is currently set at "+tempval+". It must be 1 or greater."); } if(m_maxpeermessages<20 || m_maxpeermessages>1000) { - m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxPeerMessagesPerDay is currently set at "+tempval+". This value might be incorrectly configured. The suggested value is 200."); + m_log->warning("Option MaxPeerMessagesPerDay is currently set at "+tempval+". This value might be incorrectly configured. The suggested value is 200."); } Option::Instance()->Get("MaxBoardsPerMessage",tempval); StringFunctions::Convert(tempval,m_maxboardspermessage); if(m_maxboardspermessage<1) { m_maxboardspermessage=1; - m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"Option MaxBoardsPerMessage is currently set at "+tempval+". It must be 1 or greater."); + m_log->error("Option MaxBoardsPerMessage is currently set at "+tempval+". It must be 1 or greater."); } if(m_maxboardspermessage>20) { - m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardsPerMessage is currently set at "+tempval+". This value might be incorrectly configured."); + m_log->warning("Option MaxBoardsPerMessage is currently set at "+tempval+". This value might be incorrectly configured."); } Option::Instance()->Get("SaveMessagesFromNewBoards",tempval); @@ -392,19 +393,18 @@ void MessageRequester::Initialize() void MessageRequester::PopulateIDList() { - DateTime date; + Poco::DateTime date; std::string val1; std::string val2; std::string val3; std::string sql; long requestindex; - date.SetToGMTime(); - date.Add(0,0,0,-m_maxdaysbackward); + date-=Poco::Timespan(m_maxdaysbackward,0,0,0,0); sql="SELECT tblIdentity.IdentityID,Day,RequestIndex "; sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID "; - sql+="WHERE FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' "; + sql+="WHERE FromMessageList='true' AND Found='false' AND Day>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' "; if(m_localtrustoverrides==false) { sql+="AND (tblIdentity.LocalMessageTrust IS NULL OR tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) "; @@ -502,7 +502,7 @@ void MessageRequester::StartRequest(const std::string &requestid) m_requesting.push_back(requestid); - m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"MessageRequester::StartRequest requesting "+message["Identifier"]); + m_log->debug("MessageRequester::StartRequest requesting "+message["Identifier"]); } m_ids[requestid]=true;