Commit1e6899f

committed

fix: add better context and timeout for db related queries

1 parent779260e commit1e6899fCopy full SHA for 1e6899f

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1310,7 +1310,10 @@ func templateHelpers(options *coderd.Options) map[string]any {`
`1310`	`1310`	`"base_url":func()string {returnoptions.AccessURL.String() },`
`1311`	`1311`	`"current_year":func()string {returnstrconv.Itoa(time.Now().Year()) },`
`1312`	`1312`	`"logo_url":func()string {`
`1313`		`-logoURL,err:=options.Database.GetLogoURL(context.Background())`
	`1313`	`+ctx,cancel:=context.WithTimeout(context.Background(),1*time.Second)`
	`1314`	`+defercancel()`
	`1315`	`+`
	`1316`	`+logoURL,err:=options.Database.GetLogoURL(ctx)`
`1314`	`1317`	`iferr!=nil {`
`1315`	`1318`	`iferrors.Is(err,sql.ErrNoRows) {`
`1316`	`1319`	`returnnotifications.NotificationsDefaultLogoURL`
`@@ -1322,7 +1325,10 @@ func templateHelpers(options *coderd.Options) map[string]any {`
`1322`	`1325`	`returnlogoURL`
`1323`	`1326`	`},`
`1324`	`1327`	`"app_name":func()string {`
`1325`		`-appName,err:=options.Database.GetApplicationName(context.Background())`
	`1328`	`+ctx,cancel:=context.WithTimeout(context.Background(),1*time.Second)`
	`1329`	`+defercancel()`
	`1330`	`+`
	`1331`	`+appName,err:=options.Database.GetApplicationName(ctx)`
`1326`	`1332`	`iferr!=nil {`
`1327`	`1333`	`iferrors.Is(err,sql.ErrNoRows) {`
`1328`	`1334`	`returnnotifications.NotificationsDefaultAppName`

Comments

(0)