Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add debug logging to entity server startup in the case of having a filter

Browse source
This commit is contained in:
howard-stearns 2017-01-27 15:40:17 -08:00
parent 45dd09e941
commit 673ac5680f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/entities/EntityServer.cpp
View file

@ -314,7 +314,9 @@ void EntityServer::readAdditionalConfiguration(const QJsonObject& settingsSectio
// FIXME: handle atp rquests setup here. See Agent::requestScript() // FIXME: handle atp rquests setup here. See Agent::requestScript()
qInfo() << "Requesting script at URL" << qPrintable(scriptRequest->getUrl().toString()); qInfo() << "Requesting script at URL" << qPrintable(scriptRequest->getUrl().toString());
scriptRequest->send(); scriptRequest->send();
qDebug() << "script request sent";
_scriptRequestLoop.exec(); // Block here, but allow the request to be processed and its signals to be handled. _scriptRequestLoop.exec(); // Block here, but allow the request to be processed and its signals to be handled.
qDebug() << "script request event loop complete";
} }
} }
@ -351,6 +353,7 @@ static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName
return false; return false;
} }
void EntityServer::scriptRequestFinished() { void EntityServer::scriptRequestFinished() {
qDebug() << "script request completed";
auto scriptRequest = qobject_cast<ResourceRequest*>(sender()); auto scriptRequest = qobject_cast<ResourceRequest*>(sender());
const QString urlString = scriptRequest->getUrl().toString(); const QString urlString = scriptRequest->getUrl().toString();
if (scriptRequest && scriptRequest->getResult() == ResourceRequest::Success) { if (scriptRequest && scriptRequest->getResult() == ResourceRequest::Success) {
@ -364,9 +367,11 @@ void EntityServer::scriptRequestFinished() {
return hadUncaughtExceptions(_entityEditFilterEngine, _entityEditFilter); return hadUncaughtExceptions(_entityEditFilterEngine, _entityEditFilter);
}); });
scriptRequest->deleteLater(); scriptRequest->deleteLater();
qDebug() << "script request ending event loop. running:" << _scriptRequestLoop.isRunning();
if (_scriptRequestLoop.isRunning()) { if (_scriptRequestLoop.isRunning()) {
_scriptRequestLoop.quit(); _scriptRequestLoop.quit();
} }
qDebug() << "script request event loop quit";
return; return;
} }
} }
@ -379,10 +384,13 @@ void EntityServer::scriptRequestFinished() {
} }
// Hard stop of the assignment client on failure. We don't want anyone to think they have a filter in place when they don't. // Hard stop of the assignment client on failure. We don't want anyone to think they have a filter in place when they don't.
// Alas, only indications will be the above logging with assignment client restarting repeatedly, and clients will not see any entities. // Alas, only indications will be the above logging with assignment client restarting repeatedly, and clients will not see any entities.
qDebug() << "script request failure causing stop";
stop(); stop();
qDebug() << "script request ending event loop. running:" << _scriptRequestLoop.isRunning();
if (_scriptRequestLoop.isRunning()) { if (_scriptRequestLoop.isRunning()) {
_scriptRequestLoop.quit(); _scriptRequestLoop.quit();
} }
qDebug() << "script request event loop quit";
} }
void EntityServer::nodeAdded(SharedNodePointer node) { void EntityServer::nodeAdded(SharedNodePointer node) {