X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Ffreenetmasterthread.cpp;h=bef4930046797a0d3f683afd3e3752a436d04fdd;hp=7a593fc47fd95288c44b71cdb1f4097c987d52f5;hb=8adfd604a97d385869b0ce763b35d014d7aa2cca;hpb=9048d8e482c91960265f29c2b5b3112f2a52f3d8

diff --git a/src/freenet/freenetmasterthread.cpp b/src/freenet/freenetmasterthread.cpp
index 7a593fc..bef4930 100644
--- a/src/freenet/freenetmasterthread.cpp
+++ b/src/freenet/freenetmasterthread.cpp
@@ -62,7 +62,7 @@ const bool FreenetMasterThread::FCPConnect()
 		m_receivednodehello=false;
 	}
 
-	m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" trying to connect to node "+m_fcphost);
+	m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::FCPConnect trying to connect to node "+m_fcphost);
 
 	if(m_fcp.Connect(m_fcphost.c_str(),m_fcpport)==true)
 	{
@@ -71,7 +71,7 @@ const bool FreenetMasterThread::FCPConnect()
 		// send ClientHello message to node
 		m_fcp.SendMessage("ClientHello",2,"Name",clientname.c_str(),"ExpectedVersion","2.0");
 
-		m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" connected to node");
+		m_log->WriteLog(LogFile::LOGLEVEL_INFO,"FreenetMasterThread::FCPConnect connected to node");
 
 		return true;
 	}
@@ -113,7 +113,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 			{
 				info+="\t\t\t\t"+(*mi).first+"="+(*mi).second+"\r\n";
 			}
-			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,__FUNCTION__" received unhandled "+message.GetName()+" message.  Message content :\r\n"+info);
+			m_log->WriteLog(LogFile::LOGLEVEL_DEBUG,"FreenetMasterThread::HandleMessage received unhandled "+message.GetName()+" message.  Message content :\r\n"+info);
 
 			// if unhandled message was alldata - we must retrieve the data
 			if(message.GetName()=="AllData")
@@ -138,7 +138,7 @@ const bool FreenetMasterThread::HandleMessage(FCPMessage &message)
 	}
 	else
 	{
-		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" received "+message.GetName()+" message before NodeHello");
+		m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::HandleMessage received "+message.GetName()+" message before NodeHello");
 	}
 
 	return false;
@@ -174,7 +174,7 @@ void FreenetMasterThread::run()
 			if(FCPConnect()==false)
 			{
 
-				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,__FUNCTION__" could not connect to node.  Waiting 60 seconds.");
+				m_log->WriteLog(LogFile::LOGLEVEL_ERROR,"FreenetMasterThread::run could not connect to node.  Waiting 60 seconds.");
 
 				// wait 60 seconds - will then try to connect again
 				try