Address more PR comments

Author: hsubox76

packages/app/src/firebaseNamespaceCore.ts

@@ -34,7 +34,12 @@ import { FirebaseAppLiteImpl } from './lite/firebaseAppLite';
 import { DEFAULT_ENTRY_NAME, PLATFORM_LOG_STRING } from './constants';
 import { version } from '../../firebase/package.json';
 import { logger } from './logger';
-import { setUserLogHandler, setLogLevel, LogCallback, LogOptions } from '@firebase/logger';
+import {
+  setUserLogHandler,
+  setLogLevel,
+  LogCallback,
+  LogOptions
+} from '@firebase/logger';
 import { Component, ComponentType, Name } from '@firebase/component';
 
 /**
@@ -62,14 +67,7 @@ export function createFirebaseNamespaceCore(
     app,
     registerVersion,
     setLogLevel,
-    onLog: (
-      logCallback: LogCallback | null,
-      options?: LogOptions) => {
-        if (logCallback !== null && typeof logCallback !== 'function') {
-          throw ERROR_FACTORY.create(AppError.INVALID_LOG_ARGUMENT, { appName: name });
-        }
-        setUserLogHandler(logCallback, options);
-      },
+    onLog,
     // @ts-ignore
     apps: null,
     SDK_VERSION: version,
@@ -287,6 +285,15 @@ export function createFirebaseNamespaceCore(
     );
   }
 
+  function onLog(logCallback: LogCallback | null, options?: LogOptions): void {
+    if (logCallback !== null && typeof logCallback !== 'function') {
+      throw ERROR_FACTORY.create(AppError.INVALID_LOG_ARGUMENT, {
+        appName: name
+      });
+    }
+    setUserLogHandler(logCallback, options);
+  }
+
   // Map the requested service to a registered service name
   // (used to map auth to serverAuth service when needed).
   function useAsService(app: FirebaseApp, name: string): string | null {

packages/logger/src/logger.ts

@@ -216,9 +216,9 @@ export function setUserLogHandler(
   options?: LogOptions
 ): void {
   for (const instance of instances) {
-    let threshhold = instance.logLevel;
+    let customLogLevel: LogLevel | null = null;
     if (options && options.level) {
-      threshhold = levelStringToEnum[options.level];
+      customLogLevel = levelStringToEnum[options.level];
     }
     if (logCallback === null) {
       instance.userLogHandler = null;
@@ -248,7 +248,7 @@ export function setUserLogHandler(
           })
           .filter(arg => arg)
           .join(' ');
-        if (level >= threshhold) {
+        if (level >= (customLogLevel ?? instance.logLevel)) {
           logCallback({
             level: LogLevel[level].toLowerCase() as LogLevelString,
             message,