Skip to content

Commit 61850a8

Browse files
authored
Use log level in remote tunnel log (microsoft#167040)
1 parent 922c912 commit 61850a8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Emitter } from 'vs/base/common/event';
88
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
99
import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
1010
import { Disposable } from 'vs/base/common/lifecycle';
11-
import { ILogger, ILoggerService } from 'vs/platform/log/common/log';
11+
import { ILogger, ILoggerService, LogLevelToString } from 'vs/platform/log/common/log';
1212
import { dirname, join } from 'vs/base/common/path';
1313
import { ChildProcess, spawn } from 'child_process';
1414
import { IProductService } from 'vs/platform/product/common/productService';
@@ -71,6 +71,8 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
7171
this._logger = this._register(loggerService.createLogger(remoteTunnelLogResource, { name: LOGGER_NAME }));
7272
this._startTunnelProcessDelayer = new Delayer(100);
7373

74+
this._register(this._logger.onDidChangeLogLevel(l => this._logger.info('Log level changed to ' + LogLevelToString(l))));
75+
7476
this._register(sharedProcessLifecycleService.onWillShutdown(e => {
7577
if (this._tunnelProcess) {
7678
this._tunnelProcess.cancel();
@@ -154,7 +156,7 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
154156
this.setTunnelStatus(TunnelStates.connecting(localize('remoteTunnelService.building', 'Building CLI from sources')));
155157
}
156158
};
157-
const loginProcess = this.runCodeTunneCommand('login', ['user', 'login', '--provider', providerId, '--access-token', token], onOutput);
159+
const loginProcess = this.runCodeTunneCommand('login', ['user', 'login', '--provider', providerId, '--access-token', token, '--log', LogLevelToString(this._logger.getLevel())], onOutput);
158160
this._tunnelProcess = loginProcess;
159161
try {
160162
await loginProcess;
@@ -175,7 +177,7 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
175177
} else {
176178
this.setTunnelStatus(TunnelStates.connecting(localize('remoteTunnelService.openTunnel', 'Opening tunnel')));
177179
}
178-
const args = ['--parent-process-id', String(process.pid), '--accept-server-license-terms'];
180+
const args = ['--parent-process-id', String(process.pid), '--accept-server-license-terms', '--log', LogLevelToString(this._logger.getLevel())];
179181
if (hostName) {
180182
args.push('--name', hostName);
181183
} else {

0 commit comments

Comments
 (0)