#include "../../include/freenet/boardlistrequester.h"\r
#include "../../include/freenet/siteinserter.h"\r
#include "../../include/freenet/fileinserter.h"\r
+#include "../../include/freenet/fmsversionrequester.h"\r
\r
#include <Poco/UUID.h>\r
#include <Poco/UUIDGenerator.h>\r
\r
FreenetMasterThread::FreenetMasterThread()\r
{\r
- std::string fcpport;\r
\r
if(Option::Instance()->Get("FCPHost",m_fcphost)==false)\r
{\r
m_fcphost="localhost";\r
Option::Instance()->Set("FCPHost",m_fcphost);\r
}\r
- if(Option::Instance()->Get("FCPPort",fcpport)==false)\r
+ if(Option::Instance()->GetInt("FCPPort",m_fcpport)==false)\r
{\r
- fcpport="9481";\r
- Option::Instance()->Set("FCPPort",fcpport);\r
+ m_fcpport=9481;\r
+ Option::Instance()->Set("FCPPort",m_fcpport);\r
}\r
-\r
- // convert fcp port to long, and make sure it's within the valid port range\r
- if(StringFunctions::Convert(fcpport,m_fcpport)==false)\r
+ else\r
{\r
- m_fcpport=9481;\r
- Option::Instance()->Set("FCPPort","9481");\r
+ if(m_fcpport<1 || m_fcpport>65535)\r
+ {\r
+ m_fcpport=9481;\r
+ Option::Instance()->Set("FCPPort",m_fcpport);\r
+ }\r
}\r
\r
m_receivednodehello=false;\r
if(m_receivednodehello==true)\r
{\r
bool handled=false;\r
+\r
std::vector<IFCPMessageHandler *>::iterator i=m_fcpmessagehandlers.begin();\r
while(handled==false && i!=m_fcpmessagehandlers.end())\r
{\r
\r
do\r
{\r
- if(m_fcp.Connected()==false)\r
+ try\r
{\r
- // wait at least 1 minute since last successful connect\r
- now=Poco::Timestamp();\r
- if(lastconnected<=(now-Poco::Timespan(0,0,1,0,0)))\r
+ if(m_fcp.Connected()==false)\r
{\r
- if(FCPConnect()==false)\r
+ // wait at least 1 minute since last successful connect\r
+ now=Poco::Timestamp();\r
+ if(lastconnected<=(now-Poco::Timespan(0,0,1,0,0)))\r
{\r
+ if(FCPConnect()==false)\r
+ {\r
\r
- m_log->error("FreenetMasterThread::run could not connect to node. Waiting 60 seconds.");\r
+ m_log->error("FreenetMasterThread::run could not connect to node. Waiting 60 seconds.");\r
\r
- for(int i=0; i<60 && !IsCancelled(); i++)\r
+ for(int i=0; i<60 && !IsCancelled(); i++)\r
+ {\r
+ Poco::Thread::sleep(1000);\r
+ }\r
+ }\r
+ else\r
{\r
- Poco::Thread::sleep(1000);\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ lastconnected=Poco::Timestamp();\r
}\r
}\r
else\r
{\r
- lastreceivedmessage=Poco::Timestamp();\r
- lastconnected=Poco::Timestamp();\r
+ Poco::Thread::sleep(1000);\r
}\r
}\r
+ // fcp is connected\r
else\r
{\r
- Poco::Thread::sleep(1000);\r
- }\r
- }\r
- // fcp is connected\r
- else\r
- {\r
- m_fcp.Update(1);\r
+ m_fcp.Update(1);\r
\r
- // check for message on receive buffer and handle it\r
- if(m_fcp.ReceiveBufferSize()>0)\r
- {\r
- message.Reset();\r
- message=m_fcp.ReceiveMessage();\r
+ // check for message on receive buffer and handle it\r
+ if(m_fcp.ReceiveBufferSize()>0)\r
+ {\r
+ message.Reset();\r
+ message=m_fcp.ReceiveMessage();\r
\r
- if(message.GetName()!="")\r
+ if(message.GetName()!="")\r
+ {\r
+ HandleMessage(message);\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ }\r
+ }\r
+\r
+ // let objects do their processing\r
+ for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)\r
{\r
- HandleMessage(message);\r
- lastreceivedmessage=Poco::Timestamp();\r
+ (*i)->Process();\r
}\r
- }\r
\r
- // let objects do their processing\r
- for(std::vector<IPeriodicProcessor *>::iterator i=m_processors.begin(); i!=m_processors.end(); i++)\r
- {\r
- (*i)->Process();\r
- }\r
+ // if we haven't received any messages from the node in 10 minutes, something is wrong\r
+ now=Poco::Timestamp();\r
+ if(lastreceivedmessage<(now-Poco::Timespan(0,0,10,0,0)))\r
+ {\r
+ m_log->error("FreenetMasterThread::Run The Freenet node has not responded in 10 minutes. Trying to reconnect.");\r
+ m_fcp.Disconnect();\r
+ }\r
\r
- // if we haven't received any messages from the node in 10 minutes, something is wrong\r
- now=Poco::Timestamp();\r
- if(lastreceivedmessage<(now-Poco::Timespan(0,0,10,0,0)))\r
- {\r
- m_log->error("FreenetMasterThread::Run The Freenet node has not responded in 10 minutes. Trying to reconnect.");\r
- m_fcp.Disconnect();\r
- }\r
+ if(m_fcp.Connected()==false)\r
+ {\r
+ m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
+ }\r
\r
- if(m_fcp.Connected()==false)\r
- {\r
- m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
}\r
-\r
+ }\r
+ catch(Poco::Exception &e)\r
+ {\r
+ m_log->error("FreenetMasterThread::run caught exception : "+e.displayText());\r
+ }\r
+ catch(...)\r
+ {\r
+ m_log->error("FreenetMasterThread::run caught unknown exception");\r
}\r
}while(!IsCancelled() && done==false);\r
\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 FMSVersionRequester(&m_fcp));\r
\r
for(std::vector<IFreenetRegistrable *>::iterator i=m_registrables.begin(); i!=m_registrables.end(); i++)\r
{\r
projects / fms.git / blobdiff