updated to log exception

DonJayamanne · DonJayamanne · commit 264e63ca7cbe · 2016-10-12T10:16:20.000+11:00
diff --git a/src/client/common/errors.ts b/src/client/common/errors.ts
@@ -1,8 +1,10 @@
 
 export class JmpModuleLoadError extends Error {
-    constructor() {
+    readonly innerException: any;
+    constructor(error: Error) {
         const errorMessage = `Version incompatibility in Jupyter (Python extension). View 'Help' for further details.`;
         super(errorMessage);
+        this.innerException = error;
         this.message = errorMessage;
     }
 }
diff --git a/src/client/common/utils.ts b/src/client/common/utils.ts
@@ -226,7 +226,16 @@ export function formatErrorForLogging(error: Error | string): string {
             message = `Error Message: ${error.message}`;
         }
         if (error.name && error.message.indexOf(error.name) === -1) {
-            message += `, (${error.message})`;
+            message += `, (${error.name})`;
+        }
+        const innerException = (error as any).innerException;
+        if (innerException && (innerException.message || innerException.name)) {
+            if (innerException.message) {
+                message += `, Inner Error Message: ${innerException.message}`;
+            }
+            if (innerException.name && innerException.message.indexOf(innerException.name) === -1) {
+                message += `, (${innerException.name})`;
+            }
         }
     }
     return message;
diff --git a/src/client/jupyter/zmq-kernel.ts b/src/client/jupyter/zmq-kernel.ts
@@ -56,7 +56,7 @@ export class ZMQKernel extends Kernel {
         catch (ex) {
             console.log(ex);
             if (typeof ex.message === 'string' && (ex.message as string).indexOf('Module version mismatch') > 0) {
-                throw new JmpModuleLoadError();
+                throw new JmpModuleLoadError(ex);
             }
             else {
                 throw ex;

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`
`2`	`2`	`export class JmpModuleLoadError extends Error {`
`3`		`- constructor() {`
	`3`	`+ readonly innerException: any;`
	`4`	`+ constructor(error: Error) {`
`4`	`5`	const errorMessage = `Version incompatibility in Jupyter (Python extension). View 'Help' for further details.`;
`5`	`6`	`super(errorMessage);`
	`7`	`+ this.innerException = error;`
`6`	`8`	`this.message = errorMessage;`
`7`	`9`	`}`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,16 @@ export function formatErrorForLogging(error: Error \| string): string {`
`226`	`226`	message = `Error Message: ${error.message}`;
`227`	`227`	`}`
`228`	`228`	`if (error.name && error.message.indexOf(error.name) === -1) {`
`229`		- message += `, (${error.message})`;
	`229`	+ message += `, (${error.name})`;
	`230`	`+ }`
	`231`	`+ const innerException = (error as any).innerException;`
	`232`	`+ if (innerException && (innerException.message \|\| innerException.name)) {`
	`233`	`+ if (innerException.message) {`
	`234`	+ message += `, Inner Error Message: ${innerException.message}`;
	`235`	`+ }`
	`236`	`+ if (innerException.name && innerException.message.indexOf(innerException.name) === -1) {`
	`237`	+ message += `, (${innerException.name})`;
	`238`	`+ }`
`230`	`239`	`}`
`231`	`240`	`}`
`232`	`241`	`return message;`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export class ZMQKernel extends Kernel {`
`56`	`56`	`catch (ex) {`
`57`	`57`	`console.log(ex);`
`58`	`58`	`if (typeof ex.message === 'string' && (ex.message as string).indexOf('Module version mismatch') > 0) {`
`59`		`- throw new JmpModuleLoadError();`
	`59`	`+ throw new JmpModuleLoadError(ex);`
`60`	`60`	`}`
`61`	`61`	`else {`
`62`	`62`	`throw ex;`