#include "../../include/freenet/freenetmasterthread.h"\r
#include "../../include/option.h"\r
-#include "../../include/uuidgenerator.h"\r
#include "../../include/stringfunctions.h"\r
#include "../../include/freenet/unkeyedidcreator.h"\r
#include "../../include/freenet/identityinserter.h"\r
#include "../../include/freenet/trustlistinserter.h"\r
#include "../../include/freenet/trustlistrequester.h"\r
#include "../../include/freenet/messagelistrequester.h"\r
+#include "../../include/freenet/messagelistinserter.h"\r
#include "../../include/freenet/messagerequester.h"\r
#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
-#include "../../include/pthreadwrapper/thread.h"\r
+\r
+#include <Poco/UUID.h>\r
+#include <Poco/UUIDGenerator.h>\r
+#include <Poco/DateTime.h>\r
+#include <Poco/Timespan.h>\r
+#include <Poco/Thread.h>\r
\r
#include <cstdlib>\r
\r
m_receivednodehello=false;\r
}\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::FCPConnect trying to connect to node "+m_fcphost);\r
+ m_log->information("FreenetMasterThread::FCPConnect trying to connect to node "+m_fcphost);\r
\r
if(m_fcp.Connect(m_fcphost.c_str(),m_fcpport)==true)\r
{\r
- UUIDGenerator uuid;\r
- std::string clientname="FMSClient-"+uuid.Generate();\r
+ Poco::UUIDGenerator uuidgen;\r
+ Poco::UUID uuid;\r
+\r
+ try\r
+ {\r
+ uuid=uuidgen.createRandom();\r
+ }\r
+ catch(...)\r
+ {\r
+ m_log->fatal("FreenetMasterThread::FCPConnect could not generate UUID");\r
+ }\r
+\r
+ std::string clientname="FMSClient-"+uuid.toString();\r
// send ClientHello message to node\r
m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::FCPConnect connected to node");\r
+ m_log->information("FreenetMasterThread::FCPConnect connected to node");\r
\r
return true;\r
}\r
{\r
info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";\r
}\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::HandleMessage received unhandled "+message.GetName()+" message. Message content :\r\n"+info);\r
+ m_log->debug("FreenetMasterThread::HandleMessage received unhandled "+message.GetName()+" message. Message content :\r\n"+info);\r
\r
// if unhandled message was alldata - we must retrieve the data\r
if(message.GetName()=="AllData")\r
}\r
else\r
{\r
- m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::HandleMessage received "+message.GetName()+" message before NodeHello");\r
+ m_log->error("FreenetMasterThread::HandleMessage received "+message.GetName()+" message before NodeHello");\r
}\r
\r
return false;\r
m_processors.push_back(obj);\r
}\r
\r
-void FreenetMasterThread::Run()\r
+void FreenetMasterThread::run()\r
{\r
\r
- DateTime lastreceivedmessage;\r
- DateTime lastconnected;\r
- DateTime now;\r
+ Poco::DateTime lastreceivedmessage;\r
+ Poco::DateTime lastconnected;\r
+ Poco::DateTime now;\r
FCPMessage message;\r
bool done=false;\r
\r
- lastconnected.SetToGMTime();\r
- lastconnected.Add(0,-1);\r
+ lastconnected-=Poco::Timespan(0,0,1,0,0);\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread started.");\r
+ m_log->debug("FreenetMasterThread::run thread started.");\r
\r
Setup();\r
\r
if(m_fcp.Connected()==false)\r
{\r
// wait at least 1 minute since last successful connect\r
- now.SetToGMTime();\r
- if(lastconnected<=(now-(1.0/1440.0)))\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->WriteLog(LogFile::LOGLEVEL_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
{\r
- Sleep(1000);\r
+ Poco::Thread::sleep(1000);\r
}\r
}\r
else\r
{\r
- lastreceivedmessage.SetToGMTime();\r
- lastconnected.SetToGMTime();\r
+ lastreceivedmessage=Poco::Timestamp();\r
+ lastconnected=Poco::Timestamp();\r
}\r
}\r
else\r
{\r
- Sleep(1000);\r
+ Poco::Thread::sleep(1000);\r
}\r
}\r
// fcp is connected\r
if(message.GetName()!="")\r
{\r
HandleMessage(message);\r
- lastreceivedmessage.SetToGMTime();\r
+ lastreceivedmessage=Poco::Timestamp();\r
}\r
}\r
\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
+ now=Poco::Timestamp();\r
+ if(lastreceivedmessage<(now-Poco::Timespan(0,0,10,0,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_log->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
+ m_log->information("FreenetMasterThread::Run Disconnected from Freenet node.");\r
}\r
\r
}\r
\r
Shutdown();\r
\r
- m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread exiting.");\r
+ m_log->debug("FreenetMasterThread::run thread exiting.");\r
\r
}\r
\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 MessageRequester(&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
{\r
projects / fms.git / blobdiff