self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2024-11-27 08:31:20 +02:00
Code Issues Releases Activity

Fix connection leak in db migration (#819)

Browse Source
This commit is contained in:
Jesús Espino 2021-08-02 16:48:15 +02:00 committed by GitHub
parent 9b5530af5e
commit 615d7260f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/services/store/sqlstore/migrate.go
View File

@ -85,10 +85,14 @@ func appendMultipleStatementsFlag(connectionString string) (string, error) {
// migrations in MySQL need to run with the multiStatements flag
// enabled, so this method creates a new connection ensuring that it's
// enabled.
func (s *SQLStore) getMySQLMigrationConnection() (*sql.DB, error) {
connectionString, err := appendMultipleStatementsFlag(s.connectionString)
if err != nil {
return nil, err
func (s *SQLStore) getMigrationConnection() (*sql.DB, error) {
connectionString := s.connectionString
if s.dbType == mysqlDBType {
var err error
connectionString, err = appendMultipleStatementsFlag(s.connectionString)
if err != nil {
return nil, err
}
}
db, err := sql.Open(s.dbType, connectionString)
@ -115,20 +119,20 @@ func (s *SQLStore) Migrate() error {
}
}
db, err := s.getMigrationConnection()
if err != nil {
return err
}
defer db.Close()
if s.dbType == postgresDBType {
driver, err = postgres.WithInstance(s.db, &postgres.Config{MigrationsTable: migrationsTable})
driver, err = postgres.WithInstance(db, &postgres.Config{MigrationsTable: migrationsTable})
if err != nil {
return err
}
}
if s.dbType == mysqlDBType {
db, err2 := s.getMySQLMigrationConnection()
if err2 != nil {
return err2
}
defer db.Close()
driver, err = mysql.WithInstance(db, &mysql.Config{MigrationsTable: migrationsTable})
if err != nil {
return err