Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10789 from sethalves/fix-domain-server-ice-messages

Browse source 
fix the messages printed by domain-server about which name it's using to find ice-servers
This commit is contained in:
Seth Alves 2017-06-22 17:59:09 -07:00 committed by GitHub
commit 8510b60a87
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
domain-server/src/DomainServer.cpp
View file

@ -87,7 +87,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION; qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION;
qDebug() << "[VERSION] BUILD_BRANCH:" << BuildInfo::BUILD_BRANCH; qDebug() << "[VERSION] BUILD_BRANCH:" << BuildInfo::BUILD_BRANCH;
qDebug() << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES; qDebug() << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
qDebug() << "[VERSION] We will be using this default ICE server:" << ICE_SERVER_DEFAULT_HOSTNAME; qDebug() << "[VERSION] We will be using this name to find ICE servers:" << _iceServerAddr;
// make sure we have a fresh AccountManager instance // make sure we have a fresh AccountManager instance
@ -1552,7 +1552,7 @@ void DomainServer::sendHeartbeatToIceServer() {
} else { } else {
qDebug() << "Not sending ice-server heartbeat since there is no selected ice-server."; qDebug() << "Not sending ice-server heartbeat since there is no selected ice-server.";
qDebug() << "Waiting for" << ICE_SERVER_DEFAULT_HOSTNAME << "host lookup response"; qDebug() << "Waiting for" << _iceServerAddr << "host lookup response";
} }
} }
@ -2683,7 +2683,7 @@ void DomainServer::handleICEHostInfo(const QHostInfo& hostInfo) {
_iceAddressLookupID = -1; _iceAddressLookupID = -1;
if (hostInfo.error() != QHostInfo::NoError) { if (hostInfo.error() != QHostInfo::NoError) {
qWarning() << "IP address lookup failed for" << ICE_SERVER_DEFAULT_HOSTNAME << ":" << hostInfo.errorString(); qWarning() << "IP address lookup failed for" << _iceServerAddr << ":" << hostInfo.errorString();
// if we don't have an ICE server to use yet, trigger a retry // if we don't have an ICE server to use yet, trigger a retry
if (_iceServerSocket.isNull()) { if (_iceServerSocket.isNull()) {
@ -2698,7 +2698,7 @@ void DomainServer::handleICEHostInfo(const QHostInfo& hostInfo) {
_iceServerAddresses = hostInfo.addresses(); _iceServerAddresses = hostInfo.addresses();
if (countBefore == 0) { if (countBefore == 0) {
qInfo() << "Found" << _iceServerAddresses.count() << "ice-server IP addresses for" << ICE_SERVER_DEFAULT_HOSTNAME; qInfo() << "Found" << _iceServerAddresses.count() << "ice-server IP addresses for" << _iceServerAddr;
} }
if (_iceServerSocket.isNull()) { if (_iceServerSocket.isNull()) {
@ -2733,7 +2733,7 @@ void DomainServer::randomizeICEServerAddress(bool shouldTriggerHostLookup) {
// so clear the set of failed addresses and start going through them again // so clear the set of failed addresses and start going through them again
qWarning() << "All current ice-server addresses have failed - re-attempting all current addresses for" qWarning() << "All current ice-server addresses have failed - re-attempting all current addresses for"
<< ICE_SERVER_DEFAULT_HOSTNAME; << _iceServerAddr;
_failedIceServerAddresses.clear(); _failedIceServerAddresses.clear();
candidateICEAddresses = _iceServerAddresses; candidateICEAddresses = _iceServerAddresses;