Skip to content

feat: add "Show Logs" command to help with network debugging #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "coder-remote",
"publisher": "coder",
"displayName": "Coder Remote",
"displayName": "Coder",
"description": "Open any workspace with a single click.",
"repository": "https://github.com/coder/vscode-coder",
"version": "0.1.25",
@@ -168,6 +168,12 @@
"title": "Coder: Refresh Workspace",
"icon": "$(refresh)",
"when": "coder.authenticated"
},
{
"command": "coder.viewLogs",
"title": "Coder: View Logs",
"icon": "$(list-unordered)",
"when": "coder.authenticated"
}
],
"menus": {
11 changes: 11 additions & 0 deletions src/commands.ts
Original file line number Diff line number Diff line change
@@ -115,6 +115,17 @@ export class Commands {
}
}

// viewLogs opens the workspace logs.
public async viewLogs(): Promise<void> {
if (!this.storage.workspaceLogPath) {
vscode.window.showInformationMessage("No logs available.", this.storage.workspaceLogPath || "<unset>")
return
}
const uri = vscode.Uri.file(this.storage.workspaceLogPath)
const doc = await vscode.workspace.openTextDocument(uri)
await vscode.window.showTextDocument(doc)
}

public async logout(): Promise<void> {
await this.storage.setURL(undefined)
await this.storage.setSessionToken(undefined)
1 change: 1 addition & 0 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -157,6 +157,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
myWorkspacesProvider.fetchAndRefresh()
allWorkspacesProvider.fetchAndRefresh()
})
vscode.commands.registerCommand("coder.viewLogs", commands.viewLogs.bind(commands))

// Since the "onResolveRemoteAuthority:ssh-remote" activation event exists
// in package.json we're able to perform actions before the authority is
17 changes: 13 additions & 4 deletions src/remote.ts
Original file line number Diff line number Diff line change
@@ -76,6 +76,10 @@ export class Remote {
await this.closeRemote()
return
}
// CLI versions before 2.3.3 don't support the --log-dir flag!
// If this check didn't exist, VS Code connections would fail on
// older versions because of an unknown CLI argument.
const hasCoderLogs = (parsedVersion?.compare("2.3.3") || 0) >= 0 || parsedVersion?.prerelease[0] === "devel"

// Find the workspace from the URI scheme provided!
try {
@@ -426,14 +430,15 @@ export class Remote {
//
// If we didn't write to the SSH config file, connecting would fail with
// "Host not found".
await this.updateSSHConfig(authorityParts[1])
await this.updateSSHConfig(authorityParts[1], hasCoderLogs)

this.findSSHProcessID().then((pid) => {
if (!pid) {
// TODO: Show an error here!
return
}
disposables.push(this.showNetworkUpdates(pid))
this.storage.workspaceLogPath = path.join(this.storage.getLogPath(), `${pid}.log`)
})

// Register the label formatter again because SSH overrides it!
@@ -456,7 +461,7 @@ export class Remote {

// updateSSHConfig updates the SSH configuration with a wildcard that handles
// all Coder entries.
private async updateSSHConfig(hostName: string) {
private async updateSSHConfig(hostName: string, hasCoderLogs = false) {
let deploymentSSHConfig = defaultSSHConfigResponse
try {
const deploymentConfig = await getDeploymentSSHConfig()
@@ -542,12 +547,16 @@ export class Remote {
if (typeof headerCommand === "string" && headerCommand.trim().length > 0) {
headerArg = ` --header-command ${escape(headerCommand)}`
}

let logArg = ""
if (hasCoderLogs) {
await fs.mkdir(this.storage.getLogPath(), { recursive: true })
logArg = ` --log-dir ${escape(this.storage.getLogPath())}`
}
const sshValues: SSHValues = {
Host: `${Remote.Prefix}*`,
ProxyCommand: `${escape(binaryPath)}${headerArg} vscodessh --network-info-dir ${escape(
this.storage.getNetworkInfoPath(),
)} --session-token-file ${escape(this.storage.getSessionTokenPath())} --url-file ${escape(
)}${logArg} --session-token-file ${escape(this.storage.getSessionTokenPath())} --url-file ${escape(
this.storage.getURLPath(),
)} %h`,
ConnectTimeout: "0",
7 changes: 7 additions & 0 deletions src/storage.ts
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ import { getHeaderCommand, getHeaders } from "./headers"

export class Storage {
public workspace?: Workspace
public workspaceLogPath?: string

constructor(
private readonly output: vscode.OutputChannel,
@@ -279,6 +280,12 @@ export class Storage {
return path.join(this.globalStorageUri.fsPath, "net")
}

// getLogPath returns the path where log data from the Coder
// agent is stored.
public getLogPath(): string {
return path.join(this.globalStorageUri.fsPath, "log")
}

public getUserSettingsPath(): string {
return path.join(this.globalStorageUri.fsPath, "..", "..", "..", "User", "settings.json")
}