fix: logger should print one timestamp for an entire group

Logger should print a single timestamp for each "group" entry.
angular · Mar 15, 2021 · f3930c1 · f3930c1
1 parent 76e2342
commit f3930c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/client/src/client.ts b/client/src/client.ts
@@ -302,9 +302,8 @@ function getProbeLocations(configValue: string|null, bundled: string): string[]
 /**
  * Construct the arguments that's used to spawn the server process.
  * @param ctx vscode extension context
- * @param debug true if debug mode is on
  */
-function constructArgs(ctx: vscode.ExtensionContext, debug: boolean): string[] {
+function constructArgs(ctx: vscode.ExtensionContext): string[] {
   const config = vscode.workspace.getConfiguration();
   const args: string[] = ['--logToConsole'];
 
@@ -313,7 +312,7 @@ function constructArgs(ctx: vscode.ExtensionContext, debug: boolean): string[] {
     // Log file does not yet exist on disk. It is up to the server to create the file.
     const logFile = path.join(ctx.logPath, 'nglangsvc.log');
     args.push('--logFile', logFile);
-    args.push('--logVerbosity', debug ? 'verbose' : ngLog);
+    args.push('--logVerbosity', ngLog);
   }
 
   const ngdk: string|null = config.get('angular.ngdk', null);
@@ -358,7 +357,7 @@ function getServerOptions(ctx: vscode.ExtensionContext, debug: boolean): lsp.Nod
     // install prod bundle so we have to check whether dev bundle exists.
     module: debug && fs.existsSync(devBundle) ? devBundle : prodBundle,
     transport: lsp.TransportKind.ipc,
-    args: constructArgs(ctx, debug),
+    args: constructArgs(ctx),
     options: {
       env: debug ? devEnv : prodEnv,
       execArgv: debug ? devExecArgv : prodExecArgv,

diff --git a/server/src/logger.ts b/server/src/logger.ts
@@ -94,10 +94,6 @@ class Logger implements ts.server.Logger {
     }
   }
 
-  static padStringRight(str: string, padding: string) {
-    return (str + padding).slice(0, padding.length);
-  }
-
   close() {
     if (this.loggingEnabled()) {
       fs.close(this.fd, noop);
@@ -138,14 +134,14 @@ class Logger implements ts.server.Logger {
       return;
     }
 
-    s = `[${nowString()}] ${s}\n`;
+    let prefix = '';
     if (!this.inGroup || this.firstInGroup) {
-      const prefix = Logger.padStringRight(type + ' ' + this.seq.toString(), '          ');
-      s = prefix + s;
+      this.firstInGroup = false;
+      prefix = `${type} ${this.seq}`.padEnd(10) + `[${nowString()}] `;
     }
+    const entry = prefix + s + '\n';
 
-    const buf = Buffer.from(s);
-    fs.writeSync(this.fd, buf, 0, buf.length);
+    fs.writeSync(this.fd, entry);
 
     if (!this.inGroup) {
       this.seq++;