Fix logging not showing up on first window

Author: Tyriar

src/vs/code/electron-main/app.ts

@@ -60,7 +60,7 @@ import { IssueMainService } from 'vs/platform/issue/electron-main/issueMainServi
 import { IKeyboardLayoutMainService, KeyboardLayoutMainService } from 'vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService';
 import { ILaunchMainService, LaunchMainService } from 'vs/platform/launch/electron-main/launchMainService';
 import { ILifecycleMainService, LifecycleMainPhase, ShutdownReason } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ILoggerService, ILogService } from 'vs/platform/log/common/log';
 import { IMenubarMainService, MenubarMainService } from 'vs/platform/menubar/electron-main/menubarMainService';
 import { INativeHostMainService, NativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -136,6 +136,7 @@ export class CodeApplication extends Disposable {
 		private readonly userEnv: IProcessEnvironment,
 		@IInstantiationService private readonly mainInstantiationService: IInstantiationService,
 		@ILogService private readonly logService: ILogService,
+		@ILoggerService private readonly loggerService: ILoggerService,
 		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -934,8 +935,9 @@ export class CodeApplication extends Disposable {
 		const ptyHostService = new PtyHostService(
 			ptyHostStarter,
 			this.configurationService,
+			this.lifecycleMainService,
 			this.logService,
-			// accessor.get(ILoggerMainService)
+			this.loggerService
 		);
 		ptyHostService.initialize();
 		services.set(ILocalPtyService, ptyHostService);

src/vs/platform/terminal/node/ptyHostMain.ts

@@ -10,7 +10,7 @@ import { Server as UtilityProcessServer } from 'vs/base/parts/ipc/node/ipc.mp';
 import { localize } from 'vs/nls';
 import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
 import { NativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { ConsoleLogger, LogLevel } from 'vs/platform/log/common/log';
+import { ConsoleLogger, getLogLevel } from 'vs/platform/log/common/log';
 import { LoggerChannel } from 'vs/platform/log/common/logIpc';
 import { LogService } from 'vs/platform/log/common/logService';
 import { LoggerService } from 'vs/platform/log/node/loggerService';
@@ -35,7 +35,7 @@ const productService: IProductService = { _serviceBrand: undefined, ...product }
 const environmentService = new NativeEnvironmentService(parseArgs(process.argv, OPTIONS), productService);
 
 // Logging
-const loggerService = new LoggerService(LogLevel.Info, environmentService.logsHome);
+const loggerService = new LoggerService(getLogLevel(environmentService), environmentService.logsHome);
 server.registerChannel(TerminalIpcChannels.Logger, new LoggerChannel(loggerService, () => DefaultURITransformer));
 const logger = loggerService.createLogger('ptyhost', { name: localize('ptyHost', "Pty Host") });
 const logService = new LogService(logger, [new ConsoleLogger()]);

src/vs/platform/terminal/node/ptyHostService.ts

@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Emitter } from 'vs/base/common/event';
+import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IProcessEnvironment, OperatingSystem, isWindows } from 'vs/base/common/platform';
 import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ILogService, ILoggerService } from 'vs/platform/log/common/log';
+import { RemoteLoggerChannelClient } from 'vs/platform/log/common/logIpc';
 import { getResolvedShellEnv } from 'vs/platform/shell/node/shellEnv';
 import { IPtyHostProcessReplayEvent } from 'vs/platform/terminal/common/capabilities/capabilities';
 import { RequestStore } from 'vs/platform/terminal/common/requestStore';
@@ -77,7 +78,7 @@ export class PtyHostService extends Disposable implements IPtyService {
 		private readonly _ptyHostStarter: IPtyHostStarter,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ILogService private readonly _logService: ILogService,
-		// @ILoggerService private readonly _loggerService: ILoggerService,
+		@ILoggerService private readonly _loggerService: ILoggerService,
 	) {
 		super();
 
@@ -152,9 +153,6 @@ export class PtyHostService extends Disposable implements IPtyService {
 			}
 		}));
 
-		// TODO: Setup logging
-		// this._register(new RemoteLoggerChannelClient(this._loggerService, client.getChannel(TerminalIpcChannels.Logger)));
-
 		// Create proxy and forward events
 		const proxy = ProxyChannel.toService<IPtyService>(client.getChannel(TerminalIpcChannels.PtyHost));
 		this._register(proxy.onProcessData(e => this._onProcessData.fire(e)));
@@ -165,6 +163,12 @@ export class PtyHostService extends Disposable implements IPtyService {
 		this._register(proxy.onProcessOrphanQuestion(e => this._onProcessOrphanQuestion.fire(e)));
 		this._register(proxy.onDidRequestDetach(e => this._onDidRequestDetach.fire(e)));
 
+		// HACK: When RemoteLoggerChannelClient is not delayed, the Pty Host log file won't show up
+		// in the Output view of the first window?
+		Event.once(Event.any(proxy.onProcessReady, proxy.onProcessReplay))(() => {
+			this._register(new RemoteLoggerChannelClient(this._loggerService, client.getChannel(TerminalIpcChannels.Logger)));
+		});
+
 		return [connection, proxy];
 	}