CBG-4501 define DatabaseLogCtx earlier (#7340)

torcolvin · web-flow · commit 98f9478833cc · 2025-01-31T11:35:30.000-05:00
diff --git a/rest/server_context.go b/rest/server_context.go
@@ -584,6 +584,9 @@ func (sc *ServerContext) _getOrAddDatabaseFromConfig(ctx context.Context, config
 		dbName = spec.BucketName
 	}
 
+	// we do not have per database logging parameters, but it is still useful to have the database name in the log context. This must be set again after dbcOptionsFromConfig is called.
+	ctx = base.DatabaseLogCtx(ctx, dbName, nil)
+
 	defer func() {
 		if returnedError == nil {
 			return

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,9 @@ func (sc *ServerContext) _getOrAddDatabaseFromConfig(ctx context.Context, config`
`584`	`584`	`dbName = spec.BucketName`
`585`	`585`	`}`
`586`	`586`
	`587`	`+ // we do not have per database logging parameters, but it is still useful to have the database name in the log context. This must be set again after dbcOptionsFromConfig is called.`
	`588`	`+ ctx = base.DatabaseLogCtx(ctx, dbName, nil)`
	`589`	`+`
`587`	`590`	`defer func() {`
`588`	`591`	`if returnedError == nil {`
`589`	`592`	`return`