Commit8fa91e0

committed

renamed context fetcher

1 parent6ac5911 commit8fa91e0Copy full SHA for 8fa91e0

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (c *RequestLoggerContext) WriteLog(ctx context.Context, status int) {`
`112`	`112`
`113`	`113`	`typelogContextKeystruct{}`
`114`	`114`
`115`		`-funcFromContext(ctx context.Context)*RequestLoggerContext {`
	`115`	`+funcRequestLoggerFromContext(ctx context.Context)*RequestLoggerContext {`
`116`	`116`	`val:=ctx.Value(logContextKey{})`
`117`	`117`	`iflogCtx,ok:=val.(*RequestLoggerContext);ok {`
`118`	`118`	`returnlogCtx`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ func (api API) watchInboxNotifications(rw http.ResponseWriter, r http.Request)`
`220`	`220`	`deferencoder.Close(websocket.StatusNormalClosure)`
`221`	`221`
`222`	`222`	`// Log the request immediately instead of after it completes.`
`223`		`-httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`223`	`+httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
`224`	`224`
`225`	`225`	`for {`
`226`	`226`	`select {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,7 @@ func (f *logFollower) follow() {`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`// Log the request immediately instead of after it completes.`
`558`		`-httpmw.FromContext(f.ctx).WriteLog(f.ctx,http.StatusAccepted)`
	`558`	`+httpmw.RequestLoggerFromContext(f.ctx).WriteLog(f.ctx,http.StatusAccepted)`
`559`	`559`
`560`	`560`	`// no need to wait if the job is done`
`561`	`561`	`iff.complete {`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ func (api API) workspaceAgentLogs(rw http.ResponseWriter, r http.Request) {`
`556`	`556`	`defert.Stop()`
`557`	`557`
`558`	`558`	`// Log the request immediately instead of after it completes.`
`559`		`-httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`559`	`+httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
`560`	`560`
`561`	`561`	`gofunc() {`
`562`	`562`	`deferfunc() {`
`@@ -932,7 +932,7 @@ func (api API) derpMapUpdates(rw http.ResponseWriter, r http.Request) {`
`932`	`932`	`deferencoder.Close(websocket.StatusGoingAway)`
`933`	`933`
`934`	`934`	`// Log the request immediately instead of after it completes.`
`935`		`-httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`935`	`+httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
`936`	`936`
`937`	`937`	`gofunc(ctx context.Context) {`
`938`	`938`	`// TODO(mafredri): Is this too frequent? Use separate ping disconnect timeout?`
`@@ -1322,7 +1322,7 @@ func (api *API) watchWorkspaceAgentMetadata(`
`1322`	`1322`	`defersendTicker.Stop()`
`1323`	`1323`
`1324`	`1324`	`// Log the request immediately instead of after it completes.`
`1325`		`-httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`1325`	`+httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
`1326`	`1326`
`1327`	`1327`	`// Send initial metadata.`
`1328`	`1328`	`sendMetadata()`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ func (api API) provisionerDaemonServe(rw http.ResponseWriter, r http.Request)`
`378`	`378`	`})`
`379`	`379`
`380`	`380`	`// Log the request immediately instead of after it completes.`
`381`		`-httpmw.FromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
	`381`	`+httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx,http.StatusAccepted)`
`382`	`382`
`383`	`383`	`err=server.Serve(ctx,session)`
`384`	`384`	`srvCancel()`

Comments

(0)