NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commitc1dd875

committed

fix(cli): prevent sqlDB leaks in ConnectToPostgres

1 parent3044091 commitc1dd875Copy full SHA for c1dd875

File tree

1 file changed

+19

-15

lines changed

cli
- server.go

1 file changed

+19

-15

lines changed

`‎cli/server.go`

Lines changed: 19 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1875,19 +1875,26 @@ func BuildLogger(inv clibase.Invocation, cfg codersdk.DeploymentValues) (slog.`
`1875`	`1875`	`},nil`
`1876`	`1876`	`}`
`1877`	`1877`
`1878`		`-funcConnectToPostgres(ctx context.Context,logger slog.Logger,driverstring,dbURLstring) (*sql.DB,error) {`
	`1878`	`+funcConnectToPostgres(ctx context.Context,logger slog.Logger,driverstring,dbURLstring) (sqlDB*sql.DB,errerror) {`
`1879`	`1879`	`logger.Debug(ctx,"connecting to postgresql")`
`1880`	`1880`
`1881`	`1881`	`// Try to connect for 30 seconds.`
`1882`	`1882`	`ctx,cancel:=context.WithTimeout(ctx,30*time.Second)`
`1883`	`1883`	`defercancel()`
`1884`	`1884`
`1885`		`-var (`
`1886`		`-sqlDB*sql.DB`
`1887`		`-errerror`
`1888`		`-ok=false`
`1889`		`-triesint`
`1890`		`-)`
	`1885`	`+vartriesint`
	`1886`	`+`
	`1887`	`+deferfunc() {`
	`1888`	`+iferr==nil {`
	`1889`	`+return`
	`1890`	`+}`
	`1891`	`+ifsqlDB!=nil {`
	`1892`	`+_=sqlDB.Close()`
	`1893`	`+sqlDB=nil`
	`1894`	`+}`
	`1895`	`+logger.Error(ctx,"connect to postgres; tries %d",slog.Error(err))`
	`1896`	`+}()`
	`1897`	`+`
`1891`	`1898`	`forr:=retry.New(time.Second,3*time.Second);r.Wait(ctx); {`
`1892`	`1899`	`tries++`
`1893`	`1900`
`@@ -1900,18 +1907,16 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`1900`	`1907`	`err=pingPostgres(ctx,sqlDB)`
`1901`	`1908`	`iferr!=nil {`
`1902`	`1909`	`logger.Warn(ctx,"ping postgres; retrying",slog.Error(err),slog.F("try",tries))`
	`1910`	`+_=sqlDB.Close()`
	`1911`	`+sqlDB=nil`
`1903`	`1912`	`continue`
`1904`	`1913`	`}`
`1905`	`1914`
`1906`	`1915`	`break`
`1907`	`1916`	`}`
`1908`		`-// Make sure we close the DB in case it opened but the ping failed for some`
`1909`		`-// reason.`
`1910`		`-deferfunc() {`
`1911`		`-if!ok&&sqlDB!=nil {`
`1912`		`-_=sqlDB.Close()`
`1913`		`-}`
`1914`		`-}()`
	`1917`	`+iferr==nil {`
	`1918`	`+err=ctx.Err()`
	`1919`	`+}`
`1915`	`1920`	`iferr!=nil {`
`1916`	`1921`	`returnnil,xerrors.Errorf("connect to postgres; tries %d; last error: %w",tries,err)`
`1917`	`1922`	`}`
`@@ -1958,7 +1963,6 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`1958`	`1963`	`// of connection churn.`
`1959`	`1964`	`sqlDB.SetMaxIdleConns(3)`
`1960`	`1965`
`1961`		`-ok=true`
`1962`	`1966`	`returnsqlDB,nil`
`1963`	`1967`	`}`
`1964`	`1968`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc1dd875

File tree

1 file changed

1 file changed

`‎cli/server.go`

0 commit comments