proper disposing of jupyter classes

DonJayamanne · DonJayamanne · commit 1047311f5ef0 · 2016-10-19T13:10:47.000+11:00
diff --git a/src/client/jupyter/jupyter_client/main.ts b/src/client/jupyter/jupyter_client/main.ts
@@ -24,6 +24,33 @@ export class JupyterClientAdapter extends EventEmitter implements IJupyterClient
     private ipythonAdapter: JupyterSocketClient;
 
     private startDef: Deferred<any>;
+
+    public dispose() {
+        try {
+            this.ipythonAdapter.sendKernelCommand(this.lastStartedKernelUUID, KernelCommand.shutdown)
+        }
+        catch (ex) {
+        }
+        try {
+            this.ipythonAdapter.dispose();
+        }
+        catch (ex) {
+        }
+        try {
+            this.process.kill();
+        }
+        catch (ex) {
+        }
+        try {
+            this.socketServer.Stop();
+        }
+        catch (ex) {
+        }
+        this.ipythonAdapter = null;
+        this.process = null;
+        this.socketServer = null;
+        this.startDef = null;
+    }
     public start(envVariables?: { [key: string]: string }): Promise<any> {
         if (this.startDef) {
             return this.startDef.promise;
@@ -32,6 +59,7 @@ export class JupyterClientAdapter extends EventEmitter implements IJupyterClient
         this.startDef = createDeferred<any>();
         const pyFile = path.join(__dirname, '..', '..', '..', '..', 'pythonFiles', 'PythonTools', 'ipythonServer.py');
         const newEnv = {};
+        // const newEnv = {'DEBUG_DJAYAMANNE_IPYTHON':'1'};
         Object.assign(newEnv, envVariables);
         Object.assign(newEnv, process.env);
 
@@ -119,14 +147,18 @@ export class JupyterClientAdapter extends EventEmitter implements IJupyterClient
     public getAllKernelSpecs(): Promise<{ [key: string]: Kernelspec }> {
         return this.start().then(() => this.ipythonAdapter.listKernelSpecs());
     }
+    private lastStartedKernelUUID: string;
     public startKernel(kernelSpec: KernelspecMetadata): Promise<[string, any, string]> {
         return this.start().then(() => this.getAllKernelSpecs()).then(specks => {
             // ok given the specks, find the name of the kernelspec
             const kernelSpecName = Object.keys(specks).find(kernelSpecName => {
                 const spec = specks[kernelSpecName];
                 return spec.spec.display_name === kernelSpec.display_name;
             });
-            return this.ipythonAdapter.startKernel(kernelSpecName);
+            return this.ipythonAdapter.startKernel(kernelSpecName).then(info => {
+                this.lastStartedKernelUUID = info[0];
+                return info;
+            });
         });
     }
     public shutdownkernel(kernelUUID: string): Promise<any> {
diff --git a/src/client/jupyter/kernel-manager.ts b/src/client/jupyter/kernel-manager.ts
@@ -33,6 +33,7 @@ export class KernelManagerImpl extends EventEmitter {
             kernel.dispose();
         });
         this._runningKernels.clear();
+        this.jupyterClient.dispose();
     }
 
     public setRunningKernelFor(language: string, kernel: Kernel) {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ export class KernelManagerImpl extends EventEmitter {`
`33`	`33`	`kernel.dispose();`
`34`	`34`	`});`
`35`	`35`	`this._runningKernels.clear();`
	`36`	`+ this.jupyterClient.dispose();`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`public setRunningKernelFor(language: string, kernel: Kernel) {`