Skip to content

Commit

Permalink
Fix fn references
Browse files Browse the repository at this point in the history
  • Loading branch information
filiptronicek committed Oct 21, 2024
1 parent cf6e32b commit a4772c4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/commands/workspaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export class ConnectInCurrentWindowCommand implements Command {

private async initializeLocalSSH(workspaceId: string) {
try {
await this.remoteService.updateRemoteSSHConfig();
await this.remoteService.updateRemoteConfig();
await Promise.all([
this.remoteService.setupSSHProxy(),
this.remoteService.startLocalSSHServiceServer()
Expand Down
4 changes: 2 additions & 2 deletions src/remoteConnector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export class RemoteConnector extends Disposable {
try {
this.telemetryService.sendUserFlowStatus('connecting', localSSHFlow);
// If needed, revert local-app changes first
await this.remoteService.updateRemoteSSHConfig();
await this.remoteService.updateRemoteConfig();

this.remoteService.flow = sshFlow;
await Promise.all([
Expand Down Expand Up @@ -344,7 +344,7 @@ export class RemoteConnector extends Disposable {
}
}

await this.remoteService.updateRemoteSSHConfig();
await this.remoteService.updateRemoteConfig();

await this.context.globalState.update(`${SSH_DEST_KEY}${sshDestination!.toRemoteSSHString()}`, { ...params } as SSHConnectionParams);

Expand Down
7 changes: 4 additions & 3 deletions src/services/remoteService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export interface IRemoteService {
getWorkspaceSSHDestination(wsData: WorkspaceData): Promise<{ destination: SSHDestination; password?: string }>;
showSSHPasswordModal(wsData: WorkspaceData, password: string): Promise<void>;

updateRemoteSSHConfig(): Promise<void>;
updateRemoteConfig(): Promise<void>;
initializeRemoteExtensions(): Promise<void>;
}

Expand Down Expand Up @@ -402,10 +402,11 @@ export class RemoteService extends Disposable implements IRemoteService {
throw e;
}
this.telemetryService.sendUserFlowStatus('synced', flowData);
} catch {
} catch (error) {
const msg = `Error while installing local extensions on remote.`;
this.logService.error(msg);

this.logService.trace(error)

const status = 'failed';
const seeLogs = 'See Logs';
const action = await this.notificationService.showErrorMessage(msg, { flow: flowData, id: status }, seeLogs);
Expand Down

0 comments on commit a4772c4

Please sign in to comment.