Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move initial logging to setupServerServices

Browse Source
This commit is contained in:
Alex Dima
2022-01-24 16:48:58 +01:00
parent 868bdad96d
commit 38a7ba7c6d
3 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/server/node/serverServices.ts
View File

@@ -32,6 +32,7 @@ import { IFileService } from 'vs/platform/files/common/files';
import { FileService } from 'vs/platform/files/common/fileService';
import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
@@ -78,7 +79,7 @@ function getUriTransformer(remoteAuthority: string): IURITransformer {
return _uriTransformerCache[remoteAuthority];
}
export async function setupServerServices(connectionToken: ServerConnectionToken, args: ServerParsedArgs, disposables: DisposableStore) {
export async function setupServerServices(connectionToken: ServerConnectionToken, args: ServerParsedArgs, REMOTE_DATA_FOLDER: string, disposables: DisposableStore) {
const services = new ServiceCollection();
const socketServer = new SocketServer<RemoteAgentConnectionContext>();
@@ -94,6 +95,13 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
services.set(ILogService, logService);
setTimeout(() => cleanupOlderLogs(environmentService.logsPath).then(null, err => logService.error(err)), 10000);
logService.trace(`Remote configuration data at ${REMOTE_DATA_FOLDER}`);
logService.trace('process arguments:', environmentService.args);
const serverGreeting = productService.serverGreeting.join('\n');
if (serverGreeting) {
logService.info(`\n\n${serverGreeting}\n\n`);
}
// ExtensionHost Debug broadcast service
socketServer.registerChannel(ExtensionHostDebugBroadcastChannel.ChannelName, new ExtensionHostDebugBroadcastChannel());
@@ -152,7 +160,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService));
const instantiationService = new InstantiationService(services);
const instantiationService: IInstantiationService = new InstantiationService(services);
services.set(ILocalizationsService, instantiationService.createInstance(LocalizationsService));
const extensionManagementCLIService = instantiationService.createInstance(ExtensionManagementCLIService);