From e417e7670b0bef8816f136adac0f3f02d394e1d1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 8 Apr 2014 14:07:31 -0700 Subject: [PATCH] cleanup DomainServer debug during config parsing --- domain-server/src/DomainServer.cpp | 6 ++---- libraries/shared/src/HifiConfigVariantMap.cpp | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 322f88188b..090e781be0 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -237,7 +237,7 @@ void DomainServer::parseAssignmentConfigs(QSet& excludedTypes) } excludedTypes.insert(assignmentType); - } + } configIndex = variantMapKeys.indexOf(assignmentConfigRegex, configIndex + 1); } @@ -250,12 +250,10 @@ void DomainServer::addStaticAssignmentToAssignmentHash(Assignment* newAssignment void DomainServer::createStaticAssignmentsForType(Assignment::Type type, const QJsonArray& configArray) { // we have a string for config for this type - qDebug() << "Parsing command line config for assignment type" << type; + qDebug() << "Parsing config for assignment type" << type; int configCounter = 0; - qDebug() << configArray; - foreach(const QJsonValue& jsonValue, configArray) { if (jsonValue.isObject()) { QJsonObject jsonObject = jsonValue.toObject(); diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp index f0dc012ffa..f68c64581b 100644 --- a/libraries/shared/src/HifiConfigVariantMap.cpp +++ b/libraries/shared/src/HifiConfigVariantMap.cpp @@ -72,6 +72,7 @@ QVariantMap HifiConfigVariantMap::mergeCLParametersWithJSONConfig(const QStringL QFile configFile(configFilePath); if (configFile.exists()) { + qDebug() << "Reading JSON config file at" << configFilePath; configFile.open(QIODevice::ReadOnly); QJsonDocument configDocument = QJsonDocument::fromJson(configFile.readAll()); @@ -85,6 +86,8 @@ QVariantMap HifiConfigVariantMap::mergeCLParametersWithJSONConfig(const QStringL mergedMap.insert(key, QVariant(rootObject[key])); } } + } else { + qDebug() << "Could not find JSON config file at" << configFilePath; } }