History

Case 19754 - Remove logging URLs and related file locations.

The goal is to strip out data that can be used by untoward users in copying models, avatars, etc.

Roxanne Skelly committed 8 years ago

Commit cef70001 parent e80468e36 files · +84 −201Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 36 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+1−6
@@ -112,7 +112,7 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) { · 111 unmodified lines
112 112
113 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();113 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
114 if (!defaultScriptsLoc.isParentOf(url)) {114 if (!defaultScriptsLoc.isParentOf(url)) {
115 qCWarning(scriptengine) << "Script.include() ignoring file path" << rawScriptURL115 qCWarning(scriptengine) << "Script.include() ignoring file path"
116 << "-- outside of standard libraries: "116 << "-- outside of standard libraries: "
117 << url.path()117 << url.path()
118 << defaultScriptsLoc.path();118 << defaultScriptsLoc.path();
@@ -393,7 +393,6 @@ void ScriptEngines::stopAllScripts(bool restart) { · 274 unmodified lines
393 }393 }
394 394
395 // stop all scripts395 // stop all scripts
396 qCDebug(scriptengine) << "stopping script..." << it.key();
397 scriptEngine->stop();396 scriptEngine->stop();
398 removeScriptEngine(scriptEngine);397 removeScriptEngine(scriptEngine);
399 }398 }
@@ -403,11 +402,8 @@ void ScriptEngines::stopAllScripts(bool restart) { · 3 unmodified lines
403 for(const auto &scriptName : toReload) {402 for(const auto &scriptName : toReload) {
404 auto scriptEngine = getScriptEngine(scriptName);403 auto scriptEngine = getScriptEngine(scriptName);
405 if (scriptEngine && !scriptEngine->isFinished()) {404 if (scriptEngine && !scriptEngine->isFinished()) {
406 qCDebug(scriptengine) << "waiting on script:" << scriptName;
407 scriptEngine->waitTillDoneRunning();405 scriptEngine->waitTillDoneRunning();
408 qCDebug(scriptengine) << "done waiting on script:" << scriptName;
409 }406 }
410 qCDebug(scriptengine) << "reloading script..." << scriptName;
411 reloadScript(scriptName);407 reloadScript(scriptName);
412 }408 }
413 if (restart) {409 if (restart) {
@@ -445,7 +441,6 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { · 31 unmodified lines
445 scriptEngine->stop();441 scriptEngine->stop();
446 removeScriptEngine(scriptEngine);442 removeScriptEngine(scriptEngine);
447 stoppedScript = true;443 stoppedScript = true;
448 qCDebug(scriptengine) << "stopping script..." << scriptURL;
449 }444 }
450 }445 }
451 return stoppedScript;446 return stoppedScript;