Initialize();\r
}\r
\r
-MessageListRequester::MessageListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp)\r
+MessageListRequester::MessageListRequester(FCPv2::Connection *fcp):IIndexRequester<long>(fcp)\r
{\r
Initialize();\r
}\r
}\r
}\r
\r
-const bool MessageListRequester::HandleAllData(FCPMessage &message)\r
+const bool MessageListRequester::HandleAllData(FCPv2::Message &message)\r
{ \r
SQLite3DB::Statement st;\r
SQLite3DB::Statement trustst;\r
StringFunctions::Convert(idparts[2],index);\r
\r
// wait for all data to be received from connection\r
- while(m_fcp->Connected() && m_fcp->ReceiveBufferSize()<datalength)\r
- {\r
- m_fcp->Update(1);\r
- }\r
+ m_fcp->WaitForBytes(1000,datalength);\r
\r
// if we got disconnected- return immediately\r
- if(m_fcp->Connected()==false)\r
+ if(m_fcp->IsConnected()==false)\r
{\r
return false;\r
}\r
\r
// receive the file\r
- data.resize(datalength);\r
- if(data.size()>0)\r
- {\r
- m_fcp->ReceiveRaw(&data[0],datalength);\r
- }\r
+ m_fcp->Receive(data,datalength);\r
\r
// parse file into xml and update the database\r
if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
if(CheckDateNotFuture(xml.GetDate(i))==false)\r
{\r
addmessage=false;\r
- m_log->error("MessageListRequester::HandleAllData date for message is in future! "+xml.GetDate(i));\r
+ m_log->error(m_fcpuniquename+"::HandleAllData date for message is in future! "+xml.GetDate(i));\r
}\r
\r
if(addmessage==true && CheckDateWithinMaxDays(xml.GetDate(i))==false)\r
if(CheckDateNotFuture(xml.GetExternalDate(i))==false)\r
{\r
addmessage=false;\r
- m_log->error("MessageListRequester::HandleAllData date for external message is in future! "+xml.GetExternalDate(i));\r
+ m_log->error(m_fcpuniquename+"::HandleAllData date for external message is in future! "+xml.GetExternalDate(i));\r
}\r
\r
if(addmessage==true && CheckDateWithinMaxDays(xml.GetExternalDate(i))==false)\r
st.Step();\r
st.Finalize();\r
\r
- m_log->debug("MessageListRequester::HandleAllData parsed MessageList XML file : "+message["Identifier"]);\r
+ m_log->debug(m_fcpuniquename+"::HandleAllData parsed MessageList XML file : "+message["Identifier"]);\r
}\r
else\r
{\r
st.Step();\r
st.Finalize();\r
\r
- m_log->error("MessageListRequester::HandleAllData error parsing MessageList XML file : "+message["Identifier"]);\r
+ m_log->error(m_fcpuniquename+"::HandleAllData error parsing MessageList XML file : "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
\r
}\r
\r
-const bool MessageListRequester::HandleGetFailed(FCPMessage &message)\r
+const bool MessageListRequester::HandleGetFailed(FCPv2::Message &message)\r
{\r
SQLite3DB::Statement st;\r
std::vector<std::string> idparts;\r
st.Step();\r
st.Finalize();\r
\r
- m_log->error("MessageListRequester::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);\r
+ m_log->error(m_fcpuniquename+"::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
\r
void MessageListRequester::Initialize()\r
{\r
- m_fcpuniquename="MessageListRequester";\r
+ m_fcpuniquename="ActiveMessageListRequester";\r
std::string tempval="";\r
\r
m_maxrequests=0;\r
Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);\r
+\r
+ // active identities get 1/2 of the max requests option + any remaining if not evenly divisible - inactive identities get 1/2\r
+ m_maxrequests=(m_maxrequests/2)+(m_maxrequests%2);\r
+\r
if(m_maxrequests<1)\r
{\r
m_maxrequests=1;\r
void MessageListRequester::PopulateIDList()\r
{\r
Poco::DateTime date;\r
+ Poco::DateTime yesterday=date-Poco::Timespan(1,0,0,0,0);\r
int id;\r
\r
SQLite3DB::Statement st;\r
// select identities we want to query (we've seen them today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
if(m_localtrustoverrides==false)\r
{\r
- st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+ st=m_db->Prepare("SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN vwIdentityStats ON tblIdentity.IdentityID=vwIdentityStats.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (vwIdentityStats.LastMessageDate>='"+Poco::DateTimeFormatter::format(yesterday,"%Y-%m-%d")+"') AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
}\r
else\r
{\r
- st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+ st=m_db->Prepare("SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN vwIdentityStats ON tblIdentity.IdentityID=vwIdentityStats.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (vwIdentityStats.LastMessageDate>='"+Poco::DateTimeFormatter::format(yesterday,"%Y-%m-%d")+"') AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
}\r
st.Step();\r
\r
}\r
}\r
\r
-void MessageListRequester::StartRedirectRequest(FCPMessage &message)\r
+void MessageListRequester::StartRedirectRequest(FCPv2::Message &message)\r
{\r
std::vector<std::string> parts;\r
std::string indexstr="";\r
std::string identityidstr="";\r
std::string datestr="";\r
- FCPMessage newmessage;\r
+ FCPv2::Message newmessage;\r
\r
// get the new edition #\r
StringFunctions::Split(message["RedirectURI"],"/",parts);\r
newmessage["ReturnType"]="direct";\r
newmessage["MaxSize"]="1000000";\r
\r
- m_fcp->SendMessage(newmessage);\r
+ m_fcp->Send(newmessage);\r
\r
}\r
\r
void MessageListRequester::StartRequest(const long &id)\r
{\r
Poco::DateTime now;\r
- FCPMessage message;\r
+ FCPv2::Message message;\r
std::string publickey;\r
int index=0;\r
std::string indexstr;\r
message["ReturnType"]="direct";\r
message["MaxSize"]="1000000";\r
\r
- m_fcp->SendMessage(message);\r
+ m_fcp->Send(message);\r
\r
m_requesting.push_back(id);\r
}\r