minor logging changes

prettier · Jan 28, 2020 · c5a04f6 · c5a04f6
1 parent 85e18af
commit c5a04f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/LoggingService.ts b/src/LoggingService.ts
@@ -47,20 +47,16 @@ export class LoggingService {
     }
   }
 
-  public logError(message: string, error?: Error | string) {
+  public logError(message: string, error?: Error) {
     if (this.logLevel === "NONE") {
       return;
     }
     this.logMessage(message, "ERROR");
-    if (error instanceof Error) {
-      if (error.message) {
-        this.outputChannel.appendLine(error.message);
-      }
-      if (error.stack) {
-        this.outputChannel.appendLine(error.stack);
-      }
-    } else if (error) {
-      this.outputChannel.appendLine(error);
+    if (error?.message) {
+      this.logMessage(error.message, "ERROR");
+    }
+    if (error?.stack) {
+      this.outputChannel.appendLine(error.stack);
     }
   }
 

diff --git a/src/ModuleResolver.ts b/src/ModuleResolver.ts
@@ -213,7 +213,10 @@ export class ModuleResolver implements Disposable {
         return { moduleInstance, modulePath };
       }
     } catch (error) {
-      this.loggingService.logError(`Failed to load ${pkgName}.`, error);
+      this.loggingService.logError(
+        `Failed to load local module ${pkgName}.`,
+        error
+      );
       if (options?.showNotifications) {
         this.notificationService.showErrorMessage(
           FAILED_TO_LOAD_MODULE_MESSAGE,
@@ -245,7 +248,7 @@ export class ModuleResolver implements Disposable {
         }
       } catch (error) {
         this.loggingService.logError(
-          `Failed to load ${pkgName} from '${modulePath}'`,
+          `Failed to load global module ${pkgName}.`,
           error
         );
         return { moduleInstance: undefined, modulePath };