Commitc9cbc63

authored

feat: Fine-tune logs presentation (#6771)

* Process debug mode logs* Debug logs are grey* Fix

1 parentc7fb5f9 commitc9cbc63Copy full SHA for c9cbc63

File tree

+29

-3

lines changed

+29

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,8 @@ func (api *API) followProvisionerJobLogs(actor rbac.Subject, jobID uuid.UUID) (<`
`347`	`347`	`logger:=api.Logger.With(slog.F("job_id",jobID))`
`348`	`348`
`349`	`349`	`var (`
`350`		`-bufferedLogs=make(chan*database.ProvisionerJobLog,128)`
	`350`	`+// With debug logging enabled length = 128 is insufficient`
	`351`	`+bufferedLogs=make(chan*database.ProvisionerJobLog,1024)`
`351`	`352`	`endOfLogs atomic.Bool`
`352`	`353`	`lastSentLogID atomic.Int64`
`353`	`354`	`)`

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,27 @@ func readAndLog(sink logSink, r io.Reader, done chan<- any, level proto.LogLevel`
`460`	`460`	`deferclose(done)`
`461`	`461`	`scanner:=bufio.NewScanner(r)`
`462`	`462`	`forscanner.Scan() {`
`463`		`-sink.Log(&proto.Log{Level:level,Output:scanner.Text()})`
	`463`	`+varlogterraformProvisionLog`
	`464`	`+err:=json.Unmarshal(scanner.Bytes(),&log)`
	`465`	`+iferr!=nil {`
	`466`	`+ifstrings.TrimSpace(scanner.Text())=="" {`
	`467`	`+continue`
	`468`	`+}`
	`469`	`+`
	`470`	`+sink.Log(&proto.Log{Level:level,Output:scanner.Text()})`
	`471`	`+continue`
	`472`	`+}`
	`473`	`+`
	`474`	`+logLevel:=convertTerraformLogLevel(log.Level,sink)`
	`475`	`+iflogLevel==proto.LogLevel_TRACE {`
	`476`	`+continue// skip TRACE log entries as they produce a lot of noise`
	`477`	`+}`
	`478`	`+`
	`479`	`+// Degrade JSON log entries marked as INFO as these are logs produced in debug mode.`
	`480`	`+iflogLevel==proto.LogLevel_INFO {`
	`481`	`+logLevel=proto.LogLevel_DEBUG`
	`482`	`+}`
	`483`	`+sink.Log(&proto.Log{Level:logLevel,Output:log.Message})`
`464`	`484`	`}`
`465`	`485`	`}`
`466`	`486`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@ func provisionEnv(config proto.Provision_Config, params []proto.ParameterValue`
`236`	`236`	`for_,gitAuth:=rangegitAuth {`
`237`	`237`	`env=append(env,provider.GitAuthAccessTokenEnvironmentVariable(gitAuth.Id)+"="+gitAuth.AccessToken)`
`238`	`238`	`}`
	`239`	`+// FIXME env = append(env, "TF_LOG=JSON")`
`239`	`240`	`returnenv,nil`
`240`	`241`	`}`
`241`	`242`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,11 @@ const useStyles = makeStyles<`
`108`	`108`	`backgroundColor:theme.palette.error.dark,`
`109`	`109`	`},`
`110`	`110`
`111`		`-"&.warning":{`
	`111`	`+"&.debug":{`
	`112`	`+backgroundColor:theme.palette.grey[900],`
	`113`	`+},`
	`114`	`+`
	`115`	`+"&.warn":{`
`112`	`116`	`backgroundColor:theme.palette.warning.dark,`
`113`	`117`	`},`
`114`	`118`	`},`

Comments

(0)