fix: logger tests, simple re-instantiation on settings change

Author: acao

packages/graphql-language-service-server/src/Logger.ts

@@ -19,39 +19,6 @@ export class Logger implements VSCodeLogger {
     debug?: boolean,
   ) {
     this.logLevel = debug ? 1 : 0;
-    // first detect the debug flag on initialization
-    void (async () => {
-      try {
-        const config = await this._connection?.workspace?.getConfiguration(
-          'vscode-graphql',
-        );
-        const debugSetting = config?.get('debug');
-        if (debugSetting === true) {
-          this.logLevel = 1;
-        }
-        if (debugSetting === false || debugSetting === null) {
-          this.logLevel = 0;
-        }
-      } catch {
-        // ignore
-      }
-    })();
-    // then watch for it to change. doesn't require re-creating the logger!
-    this._connection?.onDidChangeConfiguration(config => {
-      const debugSetting =
-        config?.settings && config.settings['vscode-graphql']?.debug;
-      // if it's undefined, it's not being passed
-      if (debugSetting === undefined) {
-        return;
-      }
-      // if it's true, set it to 1, we will eventually do log levels properly
-      if (debugSetting === true) {
-        this.logLevel = 1;
-      }
-      if (debugSetting === false || debugSetting === null) {
-        this.logLevel = 0;
-      }
-    });
   }
 
   error(message: string): void {
@@ -71,11 +38,21 @@ export class Logger implements VSCodeLogger {
       this._connection.console.log(message);
     }
   }
+  set level(level: number) {
+    this.logLevel = level;
+  }
+  get level() {
+    return this.logLevel;
+  }
 }
 
 export class NoopLogger implements VSCodeLogger {
   error() {}
   warn() {}
   info() {}
   log() {}
+  set level(_level: number) {}
+  get level() {
+    return 0;
+  }
 }

packages/graphql-language-service-server/src/MessageProcessor.ts

@@ -225,6 +225,8 @@ export class MessageProcessor {
     };
 
     try {
+      // now we have the settings so we can re-build the logger
+      this._logger.level = this._settings?.debug === true ? 1 : 0;
       // createServer() can be called with a custom config object, and
       // this is a public interface that may be used by customized versions of the server
       if (this._providedConfig) {

packages/graphql-language-service-server/src/__tests__/Logger.test.ts

@@ -21,53 +21,19 @@ describe('Logger', () => {
   it('should initialize with default log level, and ignore .log intentionally', () => {
     const logger = new Logger(connection as any);
     expect(logger).toBeDefined();
-    expect(connection.onDidChangeConfiguration).toHaveBeenCalledTimes(1);
     expect(logger.logLevel).toBe(0);
     logger.log('test');
     expect(connection.console.log).toHaveBeenCalledTimes(0);
   });
 
-  it('should initialize with default log level, then change to logging with new settings, then back when they are disabled', () => {
-    const logger = new Logger(connection as any);
-    expect(logger).toBeDefined();
-    expect(connection.onDidChangeConfiguration).toHaveBeenCalledTimes(1);
-    expect(logger.logLevel).toBe(0);
-    logger.log('test');
-    expect(connection.console.log).toHaveBeenCalledTimes(0);
-    connection.onDidChangeConfiguration.mock.calls[0][0]({
-      settings: { 'vscode-graphql': { debug: true } },
-    });
-    expect(logger.logLevel).toBe(1);
-    logger.log('test');
-    expect(connection.console.log).toHaveBeenCalledTimes(1);
-    connection.onDidChangeConfiguration.mock.calls[0][0]({
-      settings: { 'vscode-graphql': { debug: false } },
-    });
-    expect(logger.logLevel).toBe(0);
-    logger.log('test');
-    // and not a second time
-    expect(connection.console.log).toHaveBeenCalledTimes(1);
-  });
-
   it('should not change log level when settings are not passed', () => {
     const logger = new Logger(connection as any, true);
     expect(logger).toBeDefined();
-    expect(connection.onDidChangeConfiguration).toHaveBeenCalledTimes(1);
     expect(logger.logLevel).toBe(1);
     logger.log('test');
     expect(connection.console.log).toHaveBeenCalledTimes(1);
-    connection.onDidChangeConfiguration.mock.calls[0][0]({});
     expect(logger.logLevel).toBe(1);
     logger.log('test');
     expect(connection.console.log).toHaveBeenCalledTimes(2);
   });
-
-  it('should initialize with debug log level, and .log is visible now', () => {
-    const logger = new Logger(connection as any, true);
-    expect(logger).toBeDefined();
-    expect(connection.onDidChangeConfiguration).toHaveBeenCalledTimes(1);
-    expect(logger.logLevel).toBe(1);
-    logger.log('test');
-    expect(connection.console.log).toHaveBeenCalledTimes(1);
-  });
 });

packages/graphql-language-service-server/src/__tests__/startServer.spec.ts

@@ -0,0 +1,9 @@
+import startServer from '../startServer';
+
+describe('startServer', () => {
+  it('should start the server', async () => {
+    await startServer({});
+    // if the server starts, we're good
+    expect(true).toBe(true);
+  });
+});