Set timeouts on rawSQL before gorm (#1156)

google · Nov 20, 2020 · 69a0bec · 69a0bec
1 parent 4986687
commit 69a0bec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/database/database.go b/pkg/database/database.go
@@ -161,6 +161,10 @@ func (db *Database) OpenWithCacher(ctx context.Context, cacher cache.Cacher) err
 		return fmt.Errorf("failed to create database connection")
 	}
 
+	// Set connection configuration.
+	rawSQL.SetConnMaxLifetime(c.MaxConnectionLifetime)
+	rawSQL.SetConnMaxIdleTime(c.MaxConnectionIdleTime)
+
 	var rawDB *gorm.DB
 	if err := withRetries(ctx, func(ctx context.Context) error {
 		var err error
@@ -178,10 +182,6 @@ func (db *Database) OpenWithCacher(ctx context.Context, cacher cache.Cacher) err
 		return fmt.Errorf("failed to initialize gorm")
 	}
 
-	// Set connection configuration.
-	rawDB.DB().SetConnMaxLifetime(c.MaxConnectionLifetime)
-	rawDB.DB().SetConnMaxIdleTime(c.MaxConnectionIdleTime)
-
 	// Log SQL statements in debug mode.
 	if c.Debug {
 		rawDB = rawDB.LogMode(true)