Merge pull request ubiquity-os#32 from ubq-testing/development

fix: always return a LogReturn instead of null
ubq-testing · Aug 21, 2024 · c3a3ddd · c3a3ddd
2 parents d006c8c + c61e218
commit c3a3ddd
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/logs.ts b/src/logs.ts
@@ -6,11 +6,12 @@ export class Logs {
   private _maxLevel = -1;
   static console: PrettyLogs;
 
-  private _log({ level, consoleLog, logMessage, metadata, type }: LogParams): LogReturn | null {
+  private _log({ level, consoleLog, logMessage, metadata, type }: LogParams): LogReturn {
     // filter out more verbose logs according to maxLevel set in config
-    if (this._getNumericLevel(level) > this._maxLevel) return null;
+    if (this._getNumericLevel(level) <= this._maxLevel) {
+      consoleLog(logMessage, metadata);
+    }
 
-    consoleLog(logMessage, metadata);
     return new LogReturn(
       {
         raw: logMessage,
@@ -45,7 +46,7 @@ export class Logs {
     return metadata;
   }
 
-  public ok(log: string, metadata?: Metadata): LogReturn | null {
+  public ok(log: string, metadata?: Metadata): LogReturn {
     metadata = this._addDiagnosticInformation(metadata);
     return this._log({
       level: LOG_LEVEL.INFO,
@@ -56,7 +57,7 @@ export class Logs {
     });
   }
 
-  public info(log: string, metadata?: Metadata): LogReturn | null {
+  public info(log: string, metadata?: Metadata): LogReturn {
     metadata = this._addDiagnosticInformation(metadata);
     return this._log({
       level: LOG_LEVEL.INFO,
@@ -67,7 +68,7 @@ export class Logs {
     });
   }
 
-  public error(log: string, metadata?: Metadata): LogReturn | null {
+  public error(log: string, metadata?: Metadata): LogReturn {
     metadata = this._addDiagnosticInformation(metadata);
     return this._log({
       level: LOG_LEVEL.ERROR,
@@ -78,7 +79,7 @@ export class Logs {
     });
   }
 
-  public debug(log: string, metadata?: Metadata): LogReturn | null {
+  public debug(log: string, metadata?: Metadata): LogReturn {
     metadata = this._addDiagnosticInformation(metadata);
     return this._log({
       level: LOG_LEVEL.DEBUG,
@@ -89,7 +90,7 @@ export class Logs {
     });
   }
 
-  public fatal(log: string, metadata?: Metadata): LogReturn | null {
+  public fatal(log: string, metadata?: Metadata): LogReturn {
     if (!metadata) {
       metadata = Logs.convertErrorsIntoObjects(new Error(log)) as Metadata;
       const stack = metadata.stack as string[];
@@ -114,7 +115,7 @@ export class Logs {
     });
   }
 
-  public verbose(log: string, metadata?: Metadata): LogReturn | null {
+  public verbose(log: string, metadata?: Metadata): LogReturn {
     metadata = this._addDiagnosticInformation(metadata);
     return this._log({
       level: LOG_LEVEL.VERBOSE,