Skip to content

Commit 875dfb6

Browse files
committed
fix(lib/vscode): update path for logService
1 parent 8f414b5 commit 875dfb6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

lib/vscode/src/vs/server/node/channel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBu
3333
import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
3434
import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
3535
import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess';
36-
import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess'
36+
import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
3737
import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
3838
import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
3939

@@ -355,7 +355,7 @@ class VariableResolverService extends AbstractVariableResolverService {
355355
NOTE@coder: not sure where we could get this from. This is new.
356356
@jsjoeio 3/11/21
357357
*/
358-
return undefined
358+
return undefined;
359359
},
360360
getExecPath: (): string | undefined => {
361361
// Assuming that resolverEnv is just for use in the resolver and not for

lib/vscode/src/vs/server/node/marketplace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
137137
See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7
138138
3/11/21 @jsjoeio
139139
*/
140-
return fs.promises.mkdir(targetFileName, { recursive: true }).then(nextEntry)
140+
return fs.promises.mkdir(targetFileName, { recursive: true }).then(nextEntry);
141141
}
142142

143143
const dirName = path.dirname(fileName);
@@ -151,7 +151,7 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
151151
See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7
152152
3/11/21 @jsjoeio
153153
*/
154-
await fs.promises.mkdir(targetDirName, { recursive: true })
154+
await fs.promises.mkdir(targetDirName, { recursive: true });
155155

156156
const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
157157
fstream.once('close', () => next());

lib/vscode/src/vs/server/node/server.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,12 @@ export class Vscode {
234234
*/
235235
const logService = new MultiplexLogService([
236236
new ConsoleLogger(getLogLevel(environmentService)),
237-
new SpdLogLogger(RemoteExtensionLogFileName, environmentService.logsPath, false, getLogLevel(environmentService))
238-
])
237+
new SpdLogLogger(RemoteExtensionLogFileName, path.join(environmentService.logsPath, 'server.log'), false, getLogLevel(environmentService))
238+
]);
239239
const fileService = new FileService(logService);
240240
fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService));
241241

242-
const loggerService = new LoggerService(logService, fileService)
242+
const loggerService = new LoggerService(logService, fileService);
243243

244244
const piiPaths = [
245245
path.join(environmentService.userDataPath, 'clp'), // Language packs.

0 commit comments

Comments
 (0)