Commit3e50965

committed

chore: add logger to WatchContainers

1 parent001ccda commit3e50965Copy full SHA for 3e50965

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,8 @@ func (api API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r http.Re`
`853`	`853`	`}`
`854`	`854`	`deferrelease()`
`855`	`855`
`856`		`-containersCh,closer,err:=agentConn.WatchContainers(ctx)`
	`856`	`+watcherLogger:=api.Logger.Named("agent_container_watcher").With(slog.F("agent_id",workspaceAgent.ID))`
	`857`	`+containersCh,closer,err:=agentConn.WatchContainers(ctx,watcherLogger)`
`857`	`858`	`iferr!=nil {`
`858`	`859`	`httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`
`859`	`860`	`Message:"Internal error watching agent's containers.",`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ func (c *AgentConn) ListContainers(ctx context.Context) (codersdk.WorkspaceAgent`
`391`	`391`	`returnresp,json.NewDecoder(res.Body).Decode(&resp)`
`392`	`392`	`}`
`393`	`393`
`394`		`-func (c*AgentConn)WatchContainers(ctx context.Context) (<-chan codersdk.WorkspaceAgentListContainersResponse, io.Closer,error) {`
	`394`	`+func (c*AgentConn)WatchContainers(ctx context.Context,logger slog.Logger) (<-chan codersdk.WorkspaceAgentListContainersResponse, io.Closer,error) {`
`395`	`395`	`ctx,span:=tracing.StartSpan(ctx)`
`396`	`396`	`deferspan.End()`
`397`	`397`
`@@ -411,7 +411,7 @@ func (c *AgentConn) WatchContainers(ctx context.Context) (<-chan codersdk.Worksp`
`411`	`411`	`deferres.Body.Close()`
`412`	`412`	`}`
`413`	`413`
`414`		`-d:=wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn,websocket.MessageText,slog.Logger{})`
	`414`	`+d:=wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn,websocket.MessageText,logger)`
`415`	`415`	`returnd.Chan(),d,nil`
`416`	`416`	`}`
`417`	`417`

Comments

(0)