version 0.3.31

[fms.git] / src / freenet / messagelistinserter.cpp

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index 56e7013..eb943ff 100644 (file)
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -22,6 +22,14 @@ MessageListInserter::MessageListInserter(SQLite3DB::DB *db, FCPv2::Connection *f
 \r
 void MessageListInserter::CheckForNeededInsert()\r
 {\r
+\r
+       // more than 10 minutes trying to insert - restart\r
+       if(m_inserting.size()>0 && (m_laststartedinsert+Poco::Timespan(0,0,10,0,0)<=Poco::DateTime()))\r
+       {\r
+               m_log->error("MessageListInserter::CheckForNeededInsert more than 10 minutes have passed without success/failure.  Clearing inserts.");\r
+               m_inserting.clear();\r
+       }\r
+\r
        // only do 1 insert at a time\r
        if(m_inserting.size()==0)\r
        {\r
@@ -42,7 +50,8 @@ void MessageListInserter::CheckForNeededInsert()
                sql="SELECT tblLocalIdentity.LocalIdentityID ";\r
                sql+="FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID ";\r
                sql+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) ";\r
-               sql+="GROUP BY tblLocalIdentity.LocalIdentityID;";\r
+               sql+="GROUP BY tblLocalIdentity.LocalIdentityID ";\r
+               sql+="ORDER BY tblLocalIdentity.LastInsertedMessageList;";\r
 \r
                SQLite3DB::Statement st=m_db->Prepare(sql);\r
                st.Bind(0,Poco::DateTimeFormatter::format(previous,"%Y-%m-%d"));\r
@@ -204,9 +213,10 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
        st.Finalize();\r
 \r
 \r
-       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;");\r
+       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 175;");\r
        SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=?;");\r
        st.Step();\r
+\r
        while(st.RowReturned())\r
        {\r
                std::string day;\r
@@ -280,10 +290,19 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
                m_inserting.push_back(localidentityid);\r
                m_lastinsertedxml[localidentityid]=xmlstr;\r
 \r
+               m_laststartedinsert=Poco::DateTime();\r
+\r
                return true;\r
        }\r
        else\r
        {\r
+\r
+               // xml was the same one that we inserted 30 minutes ago, reset date so we don't continue checking every minute\r
+               st=m_db->Prepare("UPDATE tblLocalIdentity SET LastInsertedMessageList=? WHERE LocalIdentityID=?;");\r
+               st.Bind(0,Poco::DateTimeFormatter::format(Poco::DateTime(),"%Y-%m-%d %H:%M:%S"));\r
+               st.Bind(1,localidentityid);\r
+               st.Step();\r
+\r
                return false;\r
        }\r
 \r