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/ScriptCache.cpp (1 of 36 files). Show all

Unified · Split

libraries/script-engine/src/ScriptCache.cpp+5−13
@@ -37,9 +37,6 @@ ScriptCache::ScriptCache(QObject* parent) { · 36 unmodified lines
3737
3838 void ScriptCache::clearCache() {
3939 Lock lock(_containerLock);
40− foreach(auto& url, _scriptCache.keys()) {
41− qCDebug(scriptengine) << "clearing cache: " << url;
42− }
4340 _scriptCache.clear();
4441 }
4542
@@ -48,7 +45,6 @@ void ScriptCache::clearATPScriptsFromCache() { · 2 unmodified lines
4845 qCDebug(scriptengine) << "Clearing ATP scripts from ScriptCache";
4946 for (auto it = _scriptCache.begin(); it != _scriptCache.end();) {
5047 if (it.key().scheme() == "atp") {
51− qCDebug(scriptengine) << "Removing: " << it.key();
5248 it = _scriptCache.erase(it);
5349 } else {
5450 ++it;
@@ -60,7 +56,6 @@ void ScriptCache::deleteScript(const QUrl& unnormalizedURL) { · 5 unmodified lines
6056 QUrl url = DependencyManager::get<ResourceManager>()->normalizeURL(unnormalizedURL);
6157 Lock lock(_containerLock);
6258 if (_scriptCache.contains(url)) {
63− qCDebug(scriptengine) << "Delete script from cache:" << url.toString();
6459 _scriptCache.remove(url);
6560 }
6661 }
@@ -146,7 +141,6 @@ void ScriptCache::scriptContentAvailable(int maxRetries) { · 79 unmodified lines
146141 _activeScriptRequests.remove(url);
147142
148143 _scriptCache[url] = scriptContent = req->getData();
149− qCDebug(scriptengine) << "Done downloading script at:" << url.toString();
150144 } else {
151145 auto result = req->getResult();
152146 bool irrecoverable =
@@ -160,12 +154,12 @@ void ScriptCache::scriptContentAvailable(int maxRetries) { · 7 unmodified lines
160154
161155 int timeout = exp(scriptRequest.numRetries) * ScriptRequest::START_DELAY_BETWEEN_RETRIES;
162156 int attempt = scriptRequest.numRetries;
163− qCDebug(scriptengine) << QString("Script request failed [%1]: %2 (will retry %3 more times; attempt #%4 in %5ms...)")
164− .arg(status).arg(url.toString()).arg(maxRetries - attempt + 1).arg(attempt).arg(timeout);
157+ qCDebug(scriptengine) << QString("Script request failed [%1]: (will retry %2 more times; attempt #%3 in %4ms...)")
158+ .arg(status).arg(maxRetries - attempt + 1).arg(attempt).arg(timeout);
165159
166160 QTimer::singleShot(timeout, this, [this, url, attempt, maxRetries]() {
167− qCDebug(scriptengine) << QString("Retrying script request [%1 / %2]: %3")
168− .arg(attempt).arg(maxRetries).arg(url.toString());
161+ qCDebug(scriptengine) << QString("Retrying script request [%1 / %2]")
162+ .arg(attempt).arg(maxRetries);
169163
170164 auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
171165 nullptr, url, true, -1, "ScriptCache::scriptContentAvailable");
@@ -186,12 +180,10 @@ void ScriptCache::scriptContentAvailable(int maxRetries) { · 14 unmodified lines
186180 scriptContent = _scriptCache[url];
187181 }
188182 _activeScriptRequests.remove(url);
189− qCWarning(scriptengine) << "Error loading script from URL " << url << "(" << status <<")";
183+ qCWarning(scriptengine) << "Error loading script from URL (" << status <<")";
190184
191185 }
192186 }
193− } else {
194− qCWarning(scriptengine) << "Warning: scriptContentAvailable for inactive url: " << url;
195187 }
196188 }
197189