eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #147 from pljones/central-server-logging

Browse source 
Add some logging to the central server
This commit is contained in:
corrados 2020-04-30 19:18:20 +02:00 committed by GitHub
commit afe5de4c72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/serverlist.cpp
View file

@ -36,7 +36,8 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
bCentServPingServerInList ( bNCentServPingServerInList ),
pConnLessProtocol ( pNConLProt ),
eSvrRegStatus ( SRS_UNREGISTERED ),
iSvrRegRetries ( 0 )
iSvrRegRetries ( 0 ),
tsConsoleStream ( *( ( new ConsoleWriterFactory() )->get() ) )
{
// set the central server address
SetCentralServerAddress ( sNCentServAddr );
@ -307,6 +308,8 @@ void CServerListManager::OnTimerPingServerInList()
void CServerListManager::OnTimerPollList()
{
CVector<CHostAddress> removals;
QMutexLocker locker ( &Mutex );
// Check all list entries except of the very first one (which is the central
@ -319,6 +322,7 @@ void CServerListManager::OnTimerPollList()
if ( ServerList[iIdx].RegisterTime.elapsed() > ( SERVLIST_TIME_OUT_MINUTES * 60000 ) )
{
// remove this list entry
removals.Add ( ServerList[iIdx].HostAddr );
ServerList.removeAt ( iIdx );
}
else
@ -327,16 +331,26 @@ void CServerListManager::OnTimerPollList()
iIdx++;
}
}
locker.unlock();
foreach ( const CHostAddress HostAddr , removals )
{
tsConsoleStream << "Expired entry for "
<< HostAddr.toString() << endl;
}
}
void CServerListManager::CentralServerRegisterServer ( const CHostAddress& InetAddr,
const CHostAddress& LInetAddr,
const CServerCoreInfo& ServerInfo )
{
QMutexLocker locker ( &Mutex );
if ( bIsCentralServer && bEnabled )
{
tsConsoleStream << "Requested to register entry for "
<< InetAddr.toString() << " (" << LInetAddr.toString() << ")"
<< ": " << ServerInfo.strName << endl;
QMutexLocker locker ( &Mutex );
const int iCurServerListSize = ServerList.size();
// define invalid index used as a flag
@ -394,10 +408,13 @@ void CServerListManager::CentralServerRegisterServer ( const CHostAddress& In
void CServerListManager::CentralServerUnregisterServer ( const CHostAddress& InetAddr )
{
QMutexLocker locker ( &Mutex );
if ( bIsCentralServer && bEnabled )
{
tsConsoleStream << "Requested to unregister entry for "
<< InetAddr.toString() << endl;
QMutexLocker locker ( &Mutex );
const int iCurServerListSize = ServerList.size();
// Find the server to unregister in the list. The very first list entry
@ -587,7 +604,6 @@ void CServerListManager::SlaveServerRegisterServer ( const bool bIsRegister )
void CServerListManager::SetSvrRegStatus ( ESvrRegStatus eNSvrRegStatus )
{
// output regirstation result/update on the console
QTextStream& tsConsoleStream = *( ( new ConsoleWriterFactory() )->get() );
tsConsoleStream << "Server Registration Status update: " << svrRegStatusToString ( eNSvrRegStatus ) << endl;
// store the state and inform the GUI about the new status

2
src/serverlist.h
View file

@ -207,6 +207,8 @@ protected:
// count of registration retries
int iSvrRegRetries;
QTextStream& tsConsoleStream;
public slots:
void OnTimerPollList();
void OnTimerPingServerInList();