Merge branch 'master' into samtstern-sdkconfig-logs

firebase · Oct 10, 2019 · babf4d4 · babf4d4
2 parents 33cdaf8 + a4d588d
commit babf4d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,3 @@
 * Added support for managing the Realtime Database setting `strictTriggerValidation`.
 * Fixes trigger parser to not rely on prototype methods (#1687).
+* Fixes bug where standalone CLI would hang in the Android Studio integrated terminal.
diff --git a/src/emulator/functionsEmulator.ts b/src/emulator/functionsEmulator.ts
@@ -307,7 +307,9 @@ export class FunctionsEmulator implements EmulatorInstance {
       case "unidentified-network-access":
         EmulatorLogger.log(
           "WARN",
-          `Unknown network resource requested!\n   - URL: "${systemLog.data.href}"`
+          `External network resource requested!\n   - URL: "${
+            systemLog.data.href
+          }"\n - Be careful, this may be a production service.`
         );
         break;
       case "functions-config-missing-value":

diff --git a/standalone/firepit.js b/standalone/firepit.js
@@ -978,7 +978,7 @@ function SetWindowTitle(title) {
   if (isWindows) {
     process.title = title;
   } else {
-    process.stdout.write("\x1b]2;" + title + "\x1b\x5c");
+    process.stdout.write(String.fromCharCode(27) + "]0;" + title + String.fromCharCode(7));
   }
 }