From 5f88d958ab592f21122eaa388363700bb0052fe4 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Mon, 23 Nov 2015 18:26:15 -0800
Subject: [PATCH] CR feedback

---
 libraries/script-engine/src/ScriptEngine.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 0fdc5169b6..995a92bf83 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -135,7 +135,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam
 }
 
 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
@@ -158,6 +158,10 @@ void ScriptEngine::runInThread() {
     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);
 
@@ -184,7 +188,7 @@ void ScriptEngine::stopAllScripts(QObject* application) {
     _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()) {
@@ -223,9 +227,9 @@ void ScriptEngine::stopAllScripts(QObject* application) {
             // 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();
@@ -233,7 +237,7 @@ void ScriptEngine::stopAllScripts(QObject* application) {
     }
     _stoppingAllScripts = false;
     _allScriptsMutex.unlock();
-    qDebug() << "DONE Stopping all scripts....";
+    qCDebug(scriptengine) << "DONE Stopping all scripts....";
 }
 
 
@@ -1170,7 +1174,7 @@ void ScriptEngine::refreshFileScript(const EntityItemID& entityID) {
         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);