Merge a0841e4 into 89614cb

firebase · Jul 3, 2019 · 189eaf0 · 189eaf0
2 parents 89614cb + a0841e4
commit 189eaf0
Show file tree

Hide file tree

Showing 4 changed files with 252 additions and 165 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -2,4 +2,5 @@
 * Make `functions:shell` respect the `--port` argument.
 * Improve error message when `firebase serve` can't acquire the right port.
 * Allow running the Firestore and RTDB emulators without a configuration.
-* Allow the Firestore emulator to give more information about invalid rulesets.
+* Allow the Firestore emulator to give more information about invalid rulesets.
+* Fixes a bug where `admin.firestore()` and `app.firestore()` behaved differently.
diff --git a/src/emulator/functionsEmulator.ts b/src/emulator/functionsEmulator.ts
@@ -387,7 +387,11 @@ You can probably fix this by running "npm install ${
         EmulatorLogger.log("USER", `${clc.blackBright("> ")} ${log.text}`);
         break;
       case "DEBUG":
-        EmulatorLogger.log("DEBUG", log.text);
+        if (log.data && log.data !== {}) {
+          EmulatorLogger.log("DEBUG", `[${log.type}] ${log.text} ${JSON.stringify(log.data)}`);
+        } else {
+          EmulatorLogger.log("DEBUG", `[${log.type}] ${log.text}`);
+        }
         break;
       case "INFO":
         EmulatorLogger.logLabeled("BULLET", "functions", log.text);