X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=a9f23917e2d5fef17445a105d8b535d2cba81205;hb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;hp=398d8fa52990d1f64e04e81907aaa07d86c6517f;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 398d8fa..a9f2391 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -8,7 +8,6 @@
 #include "../../include/freenet/introductionpuzzleinserter.h"
 #include "../../include/freenet/identityintroductionrequester.h"
 #include "../../include/freenet/introductionpuzzlerequester.h"
-#include "../../include/freenet/introductionpuzzleremover.h"
 #include "../../include/freenet/identityintroductioninserter.h"
 #include "../../include/freenet/trustlistinserter.h"
 #include "../../include/freenet/trustlistrequester.h"
@@ -16,6 +15,7 @@
 #include "../../include/freenet/messagerequester.h"
 #include "../../include/freenet/messageinserter.h"
 #include "../../include/freenet/messagelistinserter.h"
+#include "../../include/freenet/periodicdbmaintenance.h"
 
 //#include <zthread/Thread.h>
 #include "../../include/pthreadwrapper/thread.h"
@@ -194,7 +194,7 @@ void FreenetMasterThread::Run()
 					done=true;
 				}
 				*/
-				for(int i=0; i<60,!IsCancelled(); i++)
+				for(int i=0; i<60 && !IsCancelled(); i++)
 				{
 					Sleep(1000);
 				}
@@ -231,6 +231,8 @@ void FreenetMasterThread::Run()
 
 	Shutdown();
 
+	m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread exiting.");
+
 }
 
 void FreenetMasterThread::Setup()
@@ -245,7 +247,6 @@ void FreenetMasterThread::Setup()
 	m_registrables.push_back(new IntroductionPuzzleInserter(&m_fcp));
 	m_registrables.push_back(new IdentityIntroductionRequester(&m_fcp));
 	m_registrables.push_back(new IntroductionPuzzleRequester(&m_fcp));
-	m_registrables.push_back(new IntroductionPuzzleRemover());
 	m_registrables.push_back(new IdentityIntroductionInserter(&m_fcp));
 	m_registrables.push_back(new TrustListInserter(&m_fcp));
 	m_registrables.push_back(new TrustListRequester(&m_fcp));
@@ -253,6 +254,7 @@ void FreenetMasterThread::Setup()
 	m_registrables.push_back(new MessageRequester(&m_fcp));
 	m_registrables.push_back(new MessageInserter(&m_fcp));
 	m_registrables.push_back(new MessageListInserter(&m_fcp));
+	m_registrables.push_back(new PeriodicDBMaintenance());
 
 	for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)
 	{