Commit09d661e

committed

Fix SSE errors not logging correctly

1 parent3e5ca51 commit09d661eCopy full SHA for 09d661e

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
	`1`	`+import{isApiError,isApiErrorResponse}from"coder/site/src/api/errors"`
`1`	`2`	`import{Workspace,WorkspaceAgent}from"coder/site/src/api/typesGenerated"`
`2`	`3`	`import{z}from"zod"`
`3`	`4`
`4`	`5`	`exportfunctionerrToStr(error:unknown,def:string){`
`5`	`6`	`if(errorinstanceofError&&error.message){`
`6`	`7`	`returnerror.message`
`7`		`-}`
`8`		`-if(typeoferror==="string"&&error.trim().length>0){`
	`8`	`+}elseif(isApiError(error)){`
	`9`	`+returnerror.response.data.message`
	`10`	`+}elseif(isApiErrorResponse(error)){`
	`11`	`+returnerror.message`
	`12`	`+}elseif(typeoferror==="string"&&error.trim().length>0){`
`9`	`13`	`returnerror`
`10`	`14`	`}`
`11`	`15`	`returndef`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ export class WorkspaceMonitor implements vscode.Disposable {`
`63`	`63`	`}`
`64`	`64`	`})`
`65`	`65`
`66`		`-eventSource.addEventListener("error",(error)=>{`
`67`		`-this.notifyError(error)`
	`66`	`+eventSource.addEventListener("error",(event)=>{`
	`67`	`+this.notifyError(event.data)`
`68`	`68`	`})`
`69`	`69`
`70`	`70`	`// Store so we can close in dispose().`
`@@ -182,9 +182,9 @@ export class WorkspaceMonitor implements vscode.Disposable {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`privatenotifyError(error:unknown){`
`185`		`-constmessage=errToStr(error,"No error message was provided")`
	`185`	`+// For now, we are not bothering the user about this.`
	`186`	`+constmessage=errToStr(error,"Got empty error")`
`186`	`187`	`this.storage.writeToCoderOutputChannel(message)`
`187`		-vscode.window.showErrorMessage(`Failed to monitor workspace:${message}`)
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`privateupdateContext(workspace:Workspace){`

Comments

(0)