projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.10
[fms.git]
/
src
/
threadcontroller.cpp
diff --git
a/src/threadcontroller.cpp
b/src/threadcontroller.cpp
index
8bfb7b5
..
48984e8
100644
(file)
--- a/
src/threadcontroller.cpp
+++ b/
src/threadcontroller.cpp
@@
-39,7
+39,7
@@
void ThreadController::ReadConfig()
}
\r
\r
tempval="";
\r
}
\r
\r
tempval="";
\r
- Option::Instance()->Get("StartH
H
TP",tempval);
\r
+ Option::Instance()->Get("StartH
T
TP",tempval);
\r
if(tempval=="true")
\r
{
\r
m_starthttp=true;
\r
if(tempval=="true")
\r
{
\r
m_starthttp=true;
\r
@@
-53,6
+53,7
@@
void ThreadController::ReadConfig()
\r
void ThreadController::RestartThreads()
\r
{
\r
\r
void ThreadController::RestartThreads()
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::RestartThreads restarting threads.");
\r
ShutdownThreads();
\r
StartThreads();
\r
}
\r
ShutdownThreads();
\r
StartThreads();
\r
}
\r
@@
-61,6
+62,7
@@
void ThreadController::ShutdownFreenetThread()
{
\r
if(m_freenetthread)
\r
{
\r
{
\r
if(m_freenetthread)
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::ShutdownFreenetThread shutting down Freenet thread.");
\r
m_freenetthread->Cancel();
\r
m_freenetthread->Join();
\r
delete m_freenetthread;
\r
m_freenetthread->Cancel();
\r
m_freenetthread->Join();
\r
delete m_freenetthread;
\r
@@
-72,6
+74,7
@@
void ThreadController::ShutdownHTTPThread()
{
\r
if(m_httpthread)
\r
{
\r
{
\r
if(m_httpthread)
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::ShutdownHTTPThread shutting down HTTP thread.");
\r
m_httpthread->Cancel();
\r
m_httpthread->Join();
\r
delete m_httpthread;
\r
m_httpthread->Cancel();
\r
m_httpthread->Join();
\r
delete m_httpthread;
\r
@@
-83,6
+86,7
@@
void ThreadController::ShutdownNNTPThread()
{
\r
if(m_nntpthread)
\r
{
\r
{
\r
if(m_nntpthread)
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::ShutdownNNTPThread shutting down NNTP thread.");
\r
m_nntpthread->Cancel();
\r
m_nntpthread->Join();
\r
delete m_nntpthread;
\r
m_nntpthread->Cancel();
\r
m_nntpthread->Join();
\r
delete m_nntpthread;
\r
@@
-99,16
+103,19
@@
void ThreadController::ShutdownThreads()
\r
void ThreadController::StartFreenetThread()
\r
{
\r
\r
void ThreadController::StartFreenetThread()
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::StartFreenetThread starting Freenet thread.");
\r
m_freenetthread=new PThread::Thread(new FreenetMasterThread());
\r
}
\r
\r
void ThreadController::StartHTTPThread()
\r
{
\r
m_freenetthread=new PThread::Thread(new FreenetMasterThread());
\r
}
\r
\r
void ThreadController::StartHTTPThread()
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::StartHTTPThread starting HTTP thread.");
\r
m_httpthread=new PThread::Thread(new HTTPThread());
\r
}
\r
\r
void ThreadController::StartNNTPThread()
\r
{
\r
m_httpthread=new PThread::Thread(new HTTPThread());
\r
}
\r
\r
void ThreadController::StartNNTPThread()
\r
{
\r
+ m_log->WriteLog(LogFile::LOGLEVEL_INFO,"ThreadController::StartNNTPThread starting NNTP thread.");
\r
m_nntpthread=new PThread::Thread(new NNTPListener());
\r
}
\r
\r
m_nntpthread=new PThread::Thread(new NNTPListener());
\r
}
\r
\r