OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

fix(lib/vscode): update path for logService

Browse Source
This commit is contained in:
Joe Previte 2021-03-12 14:43:05 -07:00
parent 8f414b5005
commit 875dfb66a4
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vscode/src/vs/server/node/channel.ts
View File

@ -33,7 +33,7 @@ import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBu
import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment'; import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment'; import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess'; import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess';
import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess' import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver'; import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints'; import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
@ -355,7 +355,7 @@ class VariableResolverService extends AbstractVariableResolverService {
NOTE@coder: not sure where we could get this from. This is new. NOTE@coder: not sure where we could get this from. This is new.
@jsjoeio 3/11/21 @jsjoeio 3/11/21
*/ */
return undefined return undefined;
}, },
getExecPath: (): string | undefined => { getExecPath: (): string | undefined => {
// Assuming that resolverEnv is just for use in the resolver and not for // Assuming that resolverEnv is just for use in the resolver and not for

4
lib/vscode/src/vs/server/node/marketplace.ts
View File

@ -137,7 +137,7 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7 See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7
3/11/21 @jsjoeio 3/11/21 @jsjoeio
*/ */
return fs.promises.mkdir(targetFileName, { recursive: true }).then(nextEntry) return fs.promises.mkdir(targetFileName, { recursive: true }).then(nextEntry);
} }
const dirName = path.dirname(fileName); const dirName = path.dirname(fileName);
@ -151,7 +151,7 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7 See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7
3/11/21 @jsjoeio 3/11/21 @jsjoeio
*/ */
await fs.promises.mkdir(targetDirName, { recursive: true }) await fs.promises.mkdir(targetDirName, { recursive: true });
const fstream = fs.createWriteStream(targetFileName, { mode: header.mode }); const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
fstream.once('close', () => next()); fstream.once('close', () => next());

6
lib/vscode/src/vs/server/node/server.ts
View File

@ -234,12 +234,12 @@ export class Vscode {
*/ */
const logService = new MultiplexLogService([ const logService = new MultiplexLogService([
new ConsoleLogger(getLogLevel(environmentService)), new ConsoleLogger(getLogLevel(environmentService)),
new SpdLogLogger(RemoteExtensionLogFileName, environmentService.logsPath, false, getLogLevel(environmentService)) new SpdLogLogger(RemoteExtensionLogFileName, path.join(environmentService.logsPath, 'server.log'), false, getLogLevel(environmentService))
]) ]);
const fileService = new FileService(logService); const fileService = new FileService(logService);
fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService)); fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService));
const loggerService = new LoggerService(logService, fileService) const loggerService = new LoggerService(logService, fileService);
const piiPaths = [ const piiPaths = [
path.join(environmentService.userDataPath, 'clp'), // Language packs. path.join(environmentService.userDataPath, 'clp'), // Language packs.