From 82399e71c2d0959249b80db421a9c1a97cebd985 Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Wed, 28 Apr 2021 19:14:24 +0200 Subject: [PATCH] Even more port forwarding logging --- src/vs/platform/remote/common/tunnel.ts | 4 ++-- src/vs/workbench/api/node/extHostTunnelService.ts | 2 +- src/vs/workbench/contrib/remote/browser/remoteExplorer.ts | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/remote/common/tunnel.ts b/src/vs/platform/remote/common/tunnel.ts index 080b647f741..06de888d61f 100644 --- a/src/vs/platform/remote/common/tunnel.ts +++ b/src/vs/platform/remote/common/tunnel.ts @@ -237,7 +237,7 @@ export abstract class AbstractTunnelService implements ITunnelService { localAddress: tunnel.localAddress, public: tunnel.public, dispose: async () => { - this.logService.trace(`ForwardedPorts: (TunnelService) dispose request for ${tunnel.tunnelRemotePort} `); + this.logService.trace(`ForwardedPorts: (TunnelService) dispose request for ${tunnel.tunnelRemoteHost}:${tunnel.tunnelRemotePort} `); const existingHost = this._tunnels.get(tunnel.tunnelRemoteHost); if (existingHost) { const existing = existingHost.get(tunnel.tunnelRemotePort); @@ -267,7 +267,7 @@ export abstract class AbstractTunnelService implements ITunnelService { } async closeTunnel(remoteHost: string, remotePort: number): Promise { - this.logService.trace(`ForwardedPorts: (TunnelService) close request for ${remotePort} `); + this.logService.trace(`ForwardedPorts: (TunnelService) close request for ${remoteHost}:${remotePort} `); const portMap = this._tunnels.get(remoteHost); if (portMap && portMap.has(remotePort)) { const value = portMap.get(remotePort)!; diff --git a/src/vs/workbench/api/node/extHostTunnelService.ts b/src/vs/workbench/api/node/extHostTunnelService.ts index afe38c53607..a33f7851f34 100644 --- a/src/vs/workbench/api/node/extHostTunnelService.ts +++ b/src/vs/workbench/api/node/extHostTunnelService.ts @@ -202,7 +202,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe } async openTunnel(extension: IExtensionDescription, forward: TunnelOptions): Promise { - this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) ${extension.identifier.value} called openTunnel API for ${forward.remoteAddress.port}.`); + this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) ${extension.identifier.value} called openTunnel API for ${forward.remoteAddress.host}:${forward.remoteAddress.port}.`); const tunnel = await this._proxy.$openTunnel(forward, extension.displayName); if (tunnel) { const disposableTunnel: vscode.Tunnel = new ExtensionTunnel(tunnel.remoteAddress, tunnel.localAddress, () => { diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts index af0ff69f350..bdaca7fbc0b 100644 --- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts +++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts @@ -154,6 +154,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu export class PortRestore implements IWorkbenchContribution { constructor( @IRemoteExplorerService readonly remoteExplorerService: IRemoteExplorerService, + @ILogService readonly logService: ILogService ) { if (!this.remoteExplorerService.tunnelModel.environmentTunnelsSet) { Event.once(this.remoteExplorerService.tunnelModel.onEnvironmentTunnelsSet)(async () => { @@ -165,6 +166,7 @@ export class PortRestore implements IWorkbenchContribution { } private async restore() { + this.logService.trace('ForwardedPorts: Doing first restore.'); return this.remoteExplorerService.restore(); } }