X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Ffreenet%2Fiindexrequester.h;h=61738687daaa69cb1d20521ce9c996461a2b71c8;hb=221236a4d3aac4144529d418ce368db5c98facb0;hp=35c16c1ca95d801c22b72bdc430cbdca10e0cf60;hpb=df316253862dc50e8e5a790d9634ef90be37badb;p=fms.git

diff --git a/include/freenet/iindexrequester.h b/include/freenet/iindexrequester.h
index 35c16c1..6173868 100644
--- a/include/freenet/iindexrequester.h
+++ b/include/freenet/iindexrequester.h
@@ -3,7 +3,6 @@
 
 #include "../idatabase.h"
 #include "../ilogger.h"
-#include "../datetime.h"
 #include "../option.h"
 #include "../stringfunctions.h"
 #include "ifreenetregistrable.h"
@@ -11,6 +10,12 @@
 #include "ifcpmessagehandler.h"
 #include "iperiodicprocessor.h"
 
+#include <Poco/DateTime.h>
+#include <Poco/Timestamp.h>
+#include <Poco/Timespan.h>
+
+#include <algorithm>
+
 #ifdef XMEM
 	#include <xmem.h>
 #endif
@@ -40,13 +45,15 @@ protected:
 	virtual const bool HandleGetFailed(FCPMessage &message)=0;
 	virtual void RemoveFromRequestList(const IDTYPE id);
 
-	DateTime m_tempdate;
+	Poco::DateTime m_tempdate;
+	Poco::DateTime m_lastreceived;
+	Poco::DateTime m_lastpopulated;
 	std::string m_messagebase;
 	std::map<IDTYPE,bool> m_ids;			// map of all ids we know and whether we have requested file from them yet
 	std::vector<IDTYPE> m_requesting;		// list of ids we are currently requesting from
 
 	// these MUST be populated by child class
-	long m_maxrequests;
+	int m_maxrequests;
 	std::string m_fcpuniquename;
 
 };
@@ -69,19 +76,21 @@ void IIndexRequester<IDTYPE>::FCPConnected()
 	// make sure variables have been initialized by the derived class
 	if(m_maxrequests==-1)
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IIndexRequester<IDTYPE>::FCPConnected maxrequests not initialized correctly!");
+		m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected maxrequests not initialized correctly!");
 	}
 	if(m_fcpuniquename=="")
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IIndexRequester<IDTYPE>::FCPConnected fcpuniquename not initialized correctly!");
+		m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected fcpuniquename not initialized correctly!");
 	}
 	if(m_fcpuniquename.find("|")!=std::string::npos)
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"IIndexRequester<IDTYPE>::FCPConnected fcpuniquename contains | character!  This is not a valid character!");
+		m_log->fatal("IIndexRequester<IDTYPE>::FCPConnected fcpuniquename "+m_fcpuniquename+" contains | character!  This is not a valid character!");
 	}
 
+	m_lastreceived=Poco::Timestamp();
 	m_requesting.clear();
 	PopulateIDList();
+	m_lastpopulated=Poco::Timestamp();
 }
 
 template <class IDTYPE>
@@ -96,6 +105,9 @@ const bool IIndexRequester<IDTYPE>::HandleMessage(FCPMessage &message)
 
 	if(message["Identifier"].find(m_fcpuniquename)==0)
 	{
+
+		m_lastreceived=Poco::Timestamp();
+
 		if(message.GetName()=="DataFound")
 		{
 			return true;
@@ -133,12 +145,17 @@ void IIndexRequester<IDTYPE>::InitializeIIndexRequester()
 	m_fcpuniquename="";
 
 	Option::Instance()->Get("MessageBase",m_messagebase);
-	m_tempdate.SetToGMTime();
+	m_tempdate=Poco::Timestamp();
+	m_lastreceived=Poco::Timestamp();
+	m_lastpopulated=Poco::Timestamp();
+	m_lastpopulated-=Poco::Timespan(0,0,10,0,0);
 }
 
 template <class IDTYPE>
 void IIndexRequester<IDTYPE>::Process()
 {
+	Poco::DateTime now;
+
 	// max is the smaller of the config value or the total number of ids we will request from
 	typename std::map<IDTYPE,bool>::size_type max=m_maxrequests>m_ids.size() ? m_ids.size() : m_maxrequests;
 
@@ -158,19 +175,27 @@ void IIndexRequester<IDTYPE>::Process()
 		}
 		else
 		{
-			// we requested from all ids in the list, repopulate the list
-			PopulateIDList();
+			// we requested from all ids in the list, repopulate the list (only every 10 minutes)
+			if(m_lastpopulated<(now-Poco::Timespan(0,0,10,0,0)))
+			{
+				PopulateIDList();
+				m_lastpopulated=Poco::Timestamp();
+			}
 		}
 	}
 	// special case - if there were 0 ids on the list when we started then we will never get a chance to repopulate the list
 	// this will recheck for ids every minute
-	DateTime now;
-	now.SetToGMTime();
-	if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))
+	if(m_ids.size()==0 && m_tempdate<(now-Poco::Timespan(0,0,1,0,0)))
 	{
 		PopulateIDList();
 		m_tempdate=now;
 	}
+	// if we haven't received any messages to this object in 10 minutes, clear the requests and repopulate id list
+	if(m_ids.size()>0 && m_lastreceived<(now-Poco::Timespan(0,0,10,0,0)))
+	{
+		m_log->error("IIndexRequester<IDTYPE>::Process "+m_fcpuniquename+" Object has not received any messages in 10 minutes.  Restarting requests.");
+		FCPConnected();
+	}
 
 }
 
@@ -185,11 +210,16 @@ void IIndexRequester<IDTYPE>::RegisterWithThread(FreenetMasterThread *thread)
 template <class IDTYPE>
 void IIndexRequester<IDTYPE>::RemoveFromRequestList(const IDTYPE id)
 {
+/*
 	typename std::vector<IDTYPE>::iterator i=m_requesting.begin();
 	while(i!=m_requesting.end() && (*i)!=id)
 	{
 		i++;
 	}
+*/
+	// better
+	typename std::vector<IDTYPE>::iterator i=std::find(m_requesting.begin(),m_requesting.end(),id);
+
 	if(i!=m_requesting.end())
 	{
 		m_requesting.erase(i);