Add setLogLevel

Author: wu-hui

packages/firestore/src/api/database.ts

@@ -68,7 +68,13 @@ import {
   validateStringEnum,
   valueDescription
 } from '../util/input_validation';
-import { getLogLevel, logError, LogLevel, setLogLevel } from '../util/log';
+import {
+  getLogLevel,
+  logError,
+  LogLevel,
+  LogLevelString,
+  setLogLevel
+} from '../util/log';
 import { AutoId } from '../util/misc';
 import { Deferred, Rejecter, Resolver } from '../util/promise';
 import { FieldPath as ExternalFieldPath } from './field_path';
@@ -586,37 +592,14 @@ export class Firestore implements firestore.FirebaseFirestore, FirebaseService {
     return new WriteBatch(this);
   }
 
-  static get logLevel(): firestore.LogLevel {
-    switch (getLogLevel()) {
-      case LogLevel.DEBUG:
-        return 'debug';
-      case LogLevel.SILENT:
-        return 'silent';
-      default:
-        // The default log level is error
-        return 'error';
-    }
+  static get logLevel(): LogLevel {
+    return getLogLevel();
   }
 
-  static setLogLevel(level: firestore.LogLevel): void {
+  static setLogLevel(level: LogLevelString): void {
     validateExactNumberOfArgs('Firestore.setLogLevel', arguments, 1);
     validateArgType('Firestore.setLogLevel', 'non-empty string', 1, level);
-    switch (level) {
-      case 'debug':
-        setLogLevel(LogLevel.DEBUG);
-        break;
-      case 'error':
-        setLogLevel(LogLevel.ERROR);
-        break;
-      case 'silent':
-        setLogLevel(LogLevel.SILENT);
-        break;
-      default:
-        throw new FirestoreError(
-          Code.INVALID_ARGUMENT,
-          'Invalid log level: ' + level
-        );
-    }
+    setLogLevel(level);
   }
 
   // Note: this is not a property because the minifier can't work correctly with

packages/firestore/src/util/log.ts

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import { Logger, LogLevel } from '@firebase/logger';
+import { Logger, LogLevel, LogLevelString } from '@firebase/logger';
 import { SDK_VERSION } from '../core/version';
 import { PlatformSupport } from '../platform/platform';
 
-export { LogLevel };
+export { LogLevel, LogLevelString };
 
 const logClient = new Logger('@firebase/firestore');
 
@@ -28,8 +28,8 @@ export function getLogLevel(): LogLevel {
   return logClient.logLevel;
 }
 
-export function setLogLevel(newLevel: LogLevel): void {
-  logClient.logLevel = newLevel;
+export function setLogLevel(newLevel: LogLevel | LogLevelString): void {
+  logClient.setLogLevel(newLevel);
 }
 
 export function logDebug(msg: string, ...obj: unknown[]): void {

packages/logger/src/logger.ts

@@ -151,6 +151,11 @@ export class Logger {
     this._logLevel = val;
   }
 
+  setLogLevel(level: LogLevelString | LogLevel): void {
+    const newLevel = typeof level === 'string' ? levelStringToEnum[level] : level;
+    this.logLevel = newLevel;
+  }
+
   /**
    * The main (internal) log handler for the Logger instance.
    * Can be set to a new function in internal package code but not by user.
@@ -205,9 +210,8 @@ export class Logger {
 }
 
 export function setLogLevel(level: LogLevelString | LogLevel): void {
-  const newLevel = typeof level === 'string' ? levelStringToEnum[level] : level;
   instances.forEach(inst => {
-    inst.logLevel = newLevel;
+    inst.setLogLevel(level);
   });
 }