version 0.2.11

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

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index a9f2391..73d26b6 100644 (file)
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -16,8 +16,11 @@
 #include "../../include/freenet/messageinserter.h"\r
 #include "../../include/freenet/messagelistinserter.h"\r
 #include "../../include/freenet/periodicdbmaintenance.h"\r
+#include "../../include/freenet/boardlistinserter.h"\r
+#include "../../include/freenet/boardlistrequester.h"\r
+#include "../../include/freenet/siteinserter.h"\r
+#include "../../include/freenet/fileinserter.h"\r
 \r
-//#include <zthread/Thread.h>\r
 #include "../../include/pthreadwrapper/thread.h"\r
 \r
 #ifdef XMEM\r
@@ -167,9 +170,15 @@ void FreenetMasterThread::RegisterPeriodicProcessor(IPeriodicProcessor *obj)
 void FreenetMasterThread::Run()\r
 {\r
 \r
+       DateTime lastreceivedmessage;\r
+       DateTime lastconnected;\r
+       DateTime now;\r
        FCPMessage message;\r
        bool done=false;\r
 \r
+       lastconnected.SetToGMTime();\r
+       lastconnected.Add(0,-1);\r
+\r
        m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread started.");\r
 \r
        Setup();\r
@@ -178,27 +187,30 @@ void FreenetMasterThread::Run()
        {\r
                if(m_fcp.Connected()==false)\r
                {\r
-                       if(FCPConnect()==false)\r
+                       // wait at least 1 minute since last successful connect\r
+                       now.SetToGMTime();\r
+                       if(lastconnected<=(now-(1.0/1440.0)))\r
                        {\r
+                               if(FCPConnect()==false)\r
+                               {\r
 \r
-                               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");\r
+                                       m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");\r
 \r
-                               // wait 60 seconds - will then try to connect again\r
-                               /*\r
-                               try\r
-                               {\r
-                                       ZThread::Thread::sleep(60000);\r
-                               }\r
-                               catch(...)\r
-                               {\r
-                                       done=true;\r
+                                       for(int i=0; i<60 && !IsCancelled(); i++)\r
+                                       {\r
+                                               Sleep(1000);\r
+                                       }\r
                                }\r
-                               */\r
-                               for(int i=0; i<60 && !IsCancelled(); i++)\r
+                               else\r
                                {\r
-                                       Sleep(1000);\r
+                                       lastreceivedmessage.SetToGMTime();\r
+                                       lastconnected.SetToGMTime();\r
                                }\r
                        }\r
+                       else\r
+                       {\r
+                               Sleep(1000);\r
+                       }\r
                }\r
                // fcp is connected\r
                else\r
@@ -214,6 +226,7 @@ void FreenetMasterThread::Run()
                                if(message.GetName()!="")\r
                                {\r
                                        HandleMessage(message);\r
+                                       lastreceivedmessage.SetToGMTime();\r
                                }\r
                        }\r
 \r
@@ -223,8 +236,20 @@ void FreenetMasterThread::Run()
                                (*i)->Process();\r
                        }\r
 \r
+                       // if we haven't received any messages from the node in 10 minutes, something is wrong\r
+                       now.SetToGMTime();\r
+                       if(lastreceivedmessage<(now-(1.0/144.0)))\r
+                       {\r
+                               m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::Run The Freenet node has not responded in 10 minutes.  Trying to reconnect.");\r
+                               m_fcp.Disconnect();\r
+                       }\r
+\r
+                       if(m_fcp.Connected()==false)\r
+                       {\r
+                               m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::Run Disconnected from Freenet node.");\r
+                       }\r
+\r
                }\r
-//     }while(!ZThread::Thread::interrupted() && done==false);\r
        }while(!IsCancelled() && done==false);\r
 \r
        m_fcp.Disconnect();\r
@@ -250,10 +275,14 @@ void FreenetMasterThread::Setup()
        m_registrables.push_back(new IdentityIntroductionInserter(&m_fcp));\r
        m_registrables.push_back(new TrustListInserter(&m_fcp));\r
        m_registrables.push_back(new TrustListRequester(&m_fcp));\r
+       m_registrables.push_back(new MessageListInserter(&m_fcp));\r
        m_registrables.push_back(new MessageListRequester(&m_fcp));\r
        m_registrables.push_back(new MessageRequester(&m_fcp));\r
        m_registrables.push_back(new MessageInserter(&m_fcp));\r
-       m_registrables.push_back(new MessageListInserter(&m_fcp));\r
+       m_registrables.push_back(new BoardListInserter(&m_fcp));\r
+       m_registrables.push_back(new BoardListRequester(&m_fcp));\r
+       m_registrables.push_back(new SiteInserter(&m_fcp));\r
+       m_registrables.push_back(new FileInserter(&m_fcp));\r
        m_registrables.push_back(new PeriodicDBMaintenance());\r
 \r
        for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)\r