X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fintroductionpuzzleinserter.cpp;h=6904186b8fb87179cb8971f082333ce29bd10ebc;hb=fcb124f8d6d3f5678e82049fb8e5e23c8cfaec6d;hp=1fa13c0f88e6e410e601e2d6e14f81df6dba3e90;hpb=07319f767b4c4f0e06e9957f217d5107b196617b;p=fms.git

diff --git a/src/freenet/introductionpuzzleinserter.cpp b/src/freenet/introductionpuzzleinserter.cpp
index 1fa13c0..6904186 100644
--- a/src/freenet/introductionpuzzleinserter.cpp
+++ b/src/freenet/introductionpuzzleinserter.cpp
@@ -33,8 +33,13 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 		
 		while(!rs.AtEnd())
 		{
-			std::string localidentityidstr;
+			int localidentityid=0;
+			std::string localidentityidstr="";
 			Poco::DateTime now;
+			float minutesbetweeninserts=0;
+			minutesbetweeninserts=1440.0/(float)m_maxpuzzleinserts;
+			Poco::DateTime lastinsert=now;
+			lastinsert-=Poco::Timespan(0,0,minutesbetweeninserts,0,0);
 
 			if(rs.GetField(0))
 			{
@@ -47,7 +52,16 @@ void IntroductionPuzzleInserter::CheckForNeededInsert()
 			// identity doesn't have any non-solved puzzles for today - start a new insert
 			if(rs2.Empty()==true)
 			{
-				StartInsert(rs.GetInt(0));
+				// make sure we are on the next day or the appropriate amount of time has elapsed since the last insert
+				if(m_lastinserted.find(rs.GetInt(0))==m_lastinserted.end() || m_lastinserted[rs.GetInt(0)]<=lastinsert || m_lastinserted[rs.GetInt(0)].day()!=now.day())
+				{
+					StartInsert(rs.GetInt(0));
+					m_lastinserted[rs.GetInt(0)]=now;
+				}
+				else
+				{
+					m_log->trace("IntroductionPuzzleInserter::CheckForNeededInsert waiting to insert puzzle for "+localidentityidstr);
+				}
 			}
 
 			rs.Next();
@@ -139,6 +153,7 @@ const bool IntroductionPuzzleInserter::HandlePutSuccessful(FCPMessage &message)
 void IntroductionPuzzleInserter::Initialize()
 {
 	m_fcpuniquename="IntroductionPuzzleInserter";
+	m_maxpuzzleinserts=50;
 }
 
 const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
@@ -173,7 +188,7 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
 	}
 	StringFunctions::Convert(index,indexstr);
 
-	if(index<50)
+	if(index<m_maxpuzzleinserts)
 	{
 		SQLite3DB::Recordset rs2=m_db->Query("SELECT PrivateKey,PublicKey FROM tblLocalIdentity WHERE LocalIdentityID="+idstring+";");
 		if(rs2.Empty()==false && rs2.GetField(0)!=NULL)
@@ -241,7 +256,7 @@ const bool IntroductionPuzzleInserter::StartInsert(const long &localidentityid)
 	}
 	else
 	{
-		m_log->warning("IntroductionPuzzleInserter::StartInsert already inserted 50 puzzles for "+idstring);
+		m_log->warning("IntroductionPuzzleInserter::StartInsert already inserted max puzzles for "+idstring);
 	}
 
 	return true;