Browse Source

Remove kernel message logging

Jason Grout 6 years ago
parent
commit
be6a65ae42

+ 1 - 16
packages/services/src/kernel/default.ts

@@ -26,7 +26,7 @@ import {
 } from './comm';
 
 import {
-  Kernel, log
+  Kernel
 } from './kernel';
 
 import {
@@ -285,7 +285,6 @@ class DefaultKernel implements Kernel.IKernel {
       if (msgType === 'status') {
         msgType += ' ' + (msg.content as any).execution_state;
       }
-      log(`JS KERNEL SENT     MESSAGE: K${this.id.slice(0, 6)} M${msg.header.msg_id.slice(0, 6)} ${msgType}`);
       this._ws.send(serialize.serialize(msg));
     }
     this._anyMessage.emit({msg, direction: 'send'});
@@ -757,7 +756,6 @@ class DefaultKernel implements Kernel.IKernel {
       this._ws.onclose = this._noOp;
       this._ws.onerror = this._noOp;
       this._ws.onmessage = this._noOp;
-      log('closing ws connection: ' + this.id.slice(0, 6));
       this._ws.close();
       this._ws = null;
     }
@@ -973,8 +971,6 @@ class DefaultKernel implements Kernel.IKernel {
    * Handle a websocket message, validating and routing appropriately.
    */
   private _onWSMessage = (evt: MessageEvent) => {
-    console.log();
-    console.log('IMMEDIATE RECEIVE', evt.data);
     if (this._wsStopped) {
       // If the socket is being closed, ignore any messages
       return;
@@ -991,16 +987,6 @@ class DefaultKernel implements Kernel.IKernel {
       throw error;
     }
 
-    let parentId = '';
-    if ((msg.parent_header as any).msg_id) {
-      parentId = 'P' + (msg.parent_header as any).msg_id.slice(0, 6) + ' ';
-    }
-    let msgType = msg.header.msg_type;
-    if (msgType === 'status') {
-      msgType += ' ' + (msg.content as any).execution_state;
-    }
-    log(`JS KERNEL RECEIVED MESSAGE: K${this.id.slice(0, 6)} C${this.clientId.slice(0, 6)} KS${this._kernelSession.slice(0, 6)} MS${msg.header.session.slice(0, 6)} ${parentId}M${msg.header.msg_id.slice(0, 6)} ${msgType} `);
-
     // Update the current kernel session id
     this._kernelSession = msg.header.session;
 
@@ -1090,7 +1076,6 @@ class DefaultKernel implements Kernel.IKernel {
     if (this._wsStopped || !this._ws) {
       return;
     }
-    log('WS Closed');
     // Clear the websocket event handlers and the socket itself.
     this._ws.onclose = this._noOp;
     this._ws.onerror = this._noOp;

+ 4 - 3
packages/services/src/kernel/future.ts

@@ -10,7 +10,7 @@ import {
 } from '@phosphor/disposable';
 
 import {
-  Kernel, log
+  Kernel
 } from './kernel';
 
 import {
@@ -176,7 +176,9 @@ class KernelFutureHandler extends DisposableDelegate implements Kernel.IFuture {
       if (!this._testFlag(Private.KernelFutureFlag.GotReply)) {
         status.push('reply');
       }
-      console.warn(`*************** DISPOSED BEFORE DONE: K${this._kernel.id.slice(0, 6)} M${this._msg.header.msg_id.slice(0, 6)} missing ${status.join(' ')}`);
+
+      // TODO: Check tests for any kernels that are disposed before done
+      // console.warn(`*************** DISPOSED BEFORE DONE: K${this._kernel.id.slice(0, 6)} M${this._msg.header.msg_id.slice(0, 6)} missing ${status.join(' ')}`);
     }
     super.dispose();
   }
@@ -229,7 +231,6 @@ class KernelFutureHandler extends DisposableDelegate implements Kernel.IFuture {
   }
 
   private _handleDone(): void {
-    log(`JS KERNEL: K${this._kernel.id.slice(0, 6)} M${this.msg.header.msg_id.slice(0, 6)} future done`);
     if (this._testFlag(Private.KernelFutureFlag.IsDone)) {
       return;
     }

+ 0 - 4
packages/services/src/kernel/kernel.ts

@@ -30,10 +30,6 @@ import {
 } from './messages';
 
 
-export
-let log = console.log;
-// log = (...x: any[]) => { return; };
-
 /**
  * A namespace for kernel types, interfaces, and type checker functions.
  */

+ 1 - 5
packages/services/test/src/kernel/ikernel.spec.ts

@@ -16,7 +16,7 @@ import {
 } from '@phosphor/signaling';
 
 import {
-  Kernel, KernelMessage, log
+  Kernel, KernelMessage
 } from '../../../lib/kernel';
 
 import {
@@ -36,7 +36,6 @@ describe('Kernel.IKernel', () => {
   beforeEach(async () => {
     defaultKernel = await Kernel.startNew();
     await defaultKernel.ready;
-    // log(`beforeEach: starting kernel ${defaultKernel.id.slice(0, 6)}`);
 
     // await defaultKernel.restart();
     // await defaultKernel.ready;
@@ -44,12 +43,9 @@ describe('Kernel.IKernel', () => {
 
   afterEach(async () => {
     if (defaultKernel.status !== 'dead') {
-      // log(`afterEach: shutting down kernel ${defaultKernel.id.slice(0, 6)}`);
       await defaultKernel.shutdown();
       defaultKernel.dispose();
     }
-    // log();
-    // log('-----------------------------------------------------------------------------------------');
   });
 
   after(async () => {

+ 1 - 3
packages/services/test/src/utils.ts

@@ -27,7 +27,7 @@ import {
 } from '../../lib';
 
 import {
-  Kernel, KernelMessage, log
+  Kernel, KernelMessage
 } from '../../lib/kernel';
 
 import {
@@ -484,7 +484,6 @@ class KernelTester extends SocketTester {
         msg = new Uint8Array(msg).buffer;
       }
       let data = deserialize(msg);
-      // log(`SERVER RECEIVED MESSAGE:    K${this._kernel.id.slice(0, 6)} M${data.header.msg_id.slice(0, 6)} ${data.header.msg_type}`);
       if (data.header.msg_type === 'kernel_info_request') {
         // First send status busy message.
         this.parentHeader = data.header;
@@ -617,7 +616,6 @@ class SessionTester extends SocketTester {
         msg = new Uint8Array(msg).buffer;
       }
       let data = deserialize(msg);
-      // log(`SERVER RECEIVED MESSAGE:    K${this._session.kernel.id.slice(0, 6)} M${data.header.msg_id.slice(0, 6)} ${data.header.msg_type}`);
       if (data.header.msg_type === 'kernel_info_request') {
         // First send status busy message.
         this.sendStatus('busy', data.header);