From e2eda0a43f4fdd938e73de219960c136bb2f30a0 Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Thu, 23 Aug 2018 17:56:29 -0700 Subject: [PATCH] Substitute process ID for "PID" in log file names This will help us solve the problem of logs getting clobbered when the server restarts. --- src/tsserver/server.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tsserver/server.ts b/src/tsserver/server.ts index 3e5986e940..53d052eefb 100644 --- a/src/tsserver/server.ts +++ b/src/tsserver/server.ts @@ -644,14 +644,18 @@ namespace ts.server { const cmdLineVerbosity = getLogLevel(findArgument("--logVerbosity")); const envLogOptions = parseLoggingEnvironmentString(process.env.TSS_LOG); - const logFileName = cmdLineLogFileName + const unsubstitutedLogFileName = cmdLineLogFileName ? stripQuotes(cmdLineLogFileName) : envLogOptions.logToFile ? envLogOptions.file || (__dirname + "/.log" + process.pid.toString()) : undefined; + const substitutedLogFileName = unsubstitutedLogFileName + ? unsubstitutedLogFileName.replace("PID", process.pid.toString()) + : undefined; + const logVerbosity = cmdLineVerbosity || envLogOptions.detailLevel; - return new Logger(logFileName!, envLogOptions.traceToConsole!, logVerbosity!); // TODO: GH#18217 + return new Logger(substitutedLogFileName!, envLogOptions.traceToConsole!, logVerbosity!); // TODO: GH#18217 } // This places log file in the directory containing editorServices.js // TODO: check that this location is writable