CR feedback

Brad Hefta-Gaub committed 10 years ago

Commit 5f88d951 parent ce46c301 file · +10 −6Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+10−6

 }
 ScriptEngine::~ScriptEngine() {
-    qDebug() << "Script Engine shutting down (destructor) for script:" << getFilename();
+    qCDebug(scriptengine) << "Script Engine shutting down (destructor) for script:" << getFilename();
     // If we're not already in the middle of stopping all scripts, then we should remove ourselves
     // from the list of running scripts. We don't do this if we're in the process of stopping all scripts
     QString scriptEngineName = QString("Script Thread:") + getFilename();
     workerThread->setObjectName(scriptEngineName);
+    // NOTE: If you connect any essential signals for proper shutdown or cleanup of
+    // the script engine, make sure to add code to "reconnect" them to the
+    // disconnectNonEssentialSignals() method
     // when the worker thread is started, call our engine's run..
     connect(workerThread, &QThread::started, this, &ScriptEngine::run);
     _allScriptsMutex.lock();
     _stoppingAllScripts = true;
-    qDebug() << "Stopping all scripts.... currently known scripts:" << _allKnownScriptEngines.size();
+    qCDebug(scriptengine) << "Stopping all scripts.... currently known scripts:" << _allKnownScriptEngines.size();
     QMutableSetIterator<ScriptEngine*> i(_allKnownScriptEngines);
     while (i.hasNext()) {
             // We need to wait for the engine to be done running before we proceed, because we don't
             // want any of the scripts final "scriptEnding()" or pending "update()" methods from accessing
             // any application state after we leave this stopAllScripts() method
-            qDebug() << "waiting on script:" << scriptName;
+            qCDebug(scriptengine) << "waiting on script:" << scriptName;
             scriptEngine->waitTillDoneRunning();
-            qDebug() << "done waiting on script:" << scriptName;
+            qCDebug(scriptengine) << "done waiting on script:" << scriptName;
             // If the script is stopped, we can remove it from our set
             i.remove();
     }
     _stoppingAllScripts = false;
     _allScriptsMutex.unlock();
-    qDebug() << "DONE Stopping all scripts....";
+    qCDebug(scriptengine) << "DONE Stopping all scripts....";
 }
         QString filePath = QUrl(details.scriptText).toLocalFile();
         auto lastModified = QFileInfo(filePath).lastModified().toMSecsSinceEpoch();
         if (lastModified > details.lastModified) {
-            qDebug() << "Reloading modified script " << details.scriptText;
+            qCDebug(scriptengine) << "Reloading modified script " << details.scriptText;
             QFile file(filePath);
             file.open(QIODevice::ReadOnly);