Commit19a8a38

committed

added logging to long lived connection opening functions

1 parent422c45c commit19a8a38Copy full SHA for 19a8a38

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,9 @@ func (api API) watchInboxNotifications(rw http.ResponseWriter, r http.Request)`
`219`	`219`	`encoder:=wsjson.NewEncoder[codersdk.GetInboxNotificationResponse](conn,websocket.MessageText)`
`220`	`220`	`deferencoder.Close(websocket.StatusNormalClosure)`
`221`	`221`
	`222`	`+// log the initial connection`
	`223`	`+httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`224`	`+`
`222`	`225`	`for {`
`223`	`226`	`select {`
`224`	`227`	`case<-ctx.Done():`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -554,9 +554,8 @@ func (f *logFollower) follow() {`
`554`	`554`	`return`
`555`	`555`	`}`
`556`	`556`
`557`		`-// write the initial connection to the logs`
`558`		`-httpmw.FromContext(f.ctx).WriteLog(`
`559`		`-f.ctx,http.StatusAccepted)`
	`557`	`+// log the initial connection`
	`558`	`+httpmw.FromContext(f.ctx).WriteLog(f.ctx,http.StatusAccepted)`
`560`	`559`
`561`	`560`	`// no need to wait if the job is done`
`562`	`561`	`iff.complete {`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,9 @@ func (api API) workspaceAgentLogs(rw http.ResponseWriter, r http.Request) {`
`555`	`555`	`t:=time.NewTicker(recheckInterval)`
`556`	`556`	`defert.Stop()`
`557`	`557`
	`558`	`+// log the initial connection`
	`559`	`+httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`560`	`+`
`558`	`561`	`gofunc() {`
`559`	`562`	`deferfunc() {`
`560`	`563`	`logger.Debug(ctx,"end log streaming loop")`
`@@ -928,6 +931,9 @@ func (api API) derpMapUpdates(rw http.ResponseWriter, r http.Request) {`
`928`	`931`	`encoder:=wsjson.NewEncoder[*tailcfg.DERPMap](ws,websocket.MessageBinary)`
`929`	`932`	`deferencoder.Close(websocket.StatusGoingAway)`
`930`	`933`
	`934`	`+// log the initial connection`
	`935`	`+httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`936`	`+`
`931`	`937`	`gofunc(ctx context.Context) {`
`932`	`938`	`// TODO(mafredri): Is this too frequent? Use separate ping disconnect timeout?`
`933`	`939`	`t:=time.NewTicker(api.AgentConnectionUpdateFrequency)`
`@@ -1315,6 +1321,9 @@ func (api *API) watchWorkspaceAgentMetadata(`
`1315`	`1321`	`sendTicker:=time.NewTicker(sendInterval)`
`1316`	`1322`	`defersendTicker.Stop()`
`1317`	`1323`
	`1324`	`+// log the initial connection`
	`1325`	`+httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`1326`	`+`
`1318`	`1327`	`// Send initial metadata.`
`1319`	`1328`	`sendMetadata()`
`1320`	`1329`

Comments

(0)