projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.2.6
[fms.git]
/
src
/
freenet
/
freenetmasterthread.cpp
diff --git
a/src/freenet/freenetmasterthread.cpp
b/src/freenet/freenetmasterthread.cpp
index
4ca447e
..
4e7b570
100644
(file)
--- a/
src/freenet/freenetmasterthread.cpp
+++ b/
src/freenet/freenetmasterthread.cpp
@@
-20,7
+20,6
@@
#include "../../include/freenet/boardlistrequester.h"
\r
#include "../../include/freenet/siteinserter.h"
\r
\r
#include "../../include/freenet/boardlistrequester.h"
\r
#include "../../include/freenet/siteinserter.h"
\r
\r
-//#include <zthread/Thread.h>
\r
#include "../../include/pthreadwrapper/thread.h"
\r
\r
#ifdef XMEM
\r
#include "../../include/pthreadwrapper/thread.h"
\r
\r
#ifdef XMEM
\r
@@
-171,10
+170,14
@@
void FreenetMasterThread::Run()
{
\r
\r
DateTime lastreceivedmessage;
\r
{
\r
\r
DateTime lastreceivedmessage;
\r
+ DateTime lastconnected;
\r
DateTime now;
\r
FCPMessage message;
\r
bool done=false;
\r
\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
m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::run thread started.");
\r
\r
Setup();
\r
@@
-183,30
+186,29
@@
void FreenetMasterThread::Run()
{
\r
if(m_fcp.Connected()==false)
\r
{
\r
{
\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
{
\r
+ if(FCPConnect()==false)
\r
+ {
\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
\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
- */
\r
- for(int i=0; i<60 && !IsCancelled(); i++)
\r
+ else
\r
{
\r
{
\r
- Sleep(1000);
\r
+ lastreceivedmessage.SetToGMTime();
\r
+ lastconnected.SetToGMTime();
\r
}
\r
}
\r
else
\r
{
\r
}
\r
}
\r
else
\r
{
\r
-
lastreceivedmessage.SetToGMTime(
);
\r
+
Sleep(1000
);
\r
}
\r
}
\r
// fcp is connected
\r
}
\r
}
\r
// fcp is connected
\r
@@
-241,8
+243,12
@@
void FreenetMasterThread::Run()
m_fcp.Disconnect();
\r
}
\r
\r
m_fcp.Disconnect();
\r
}
\r
\r
+ if(m_fcp.Connected()==false)
\r
+ {
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::Run Disconnected from Freenet node.");
\r
+ }
\r
+
\r
}
\r
}
\r
-// }while(!ZThread::Thread::interrupted() && done==false);
\r
}while(!IsCancelled() && done==false);
\r
\r
m_fcp.Disconnect();
\r
}while(!IsCancelled() && done==false);
\r
\r
m_fcp.Disconnect();
\r