Skip to content

Split configuration for open and idle database connections #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Split configuration for open and idle database connections #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmd/bbs/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ type BBSConfig struct {
DropsondePort int `json:"dropsonde_port,omitempty"`
DatabaseConnectionString string `json:"database_connection_string"`
DatabaseDriver string `json:"database_driver,omitempty"`
MaxDatabaseConnections int `json:"max_database_connections,omitempty"`
MaxOpenDatabaseConnections int `json:"max_open_database_connections,omitempty"`
MaxIdleDatabaseConnections int `json:"max_idle_database_connections,omitempty"`
SQLCACertFile string `json:"sql_ca_cert_file,omitempty"`
AuctioneerAddress string `json:"auctioneer_address,omitempty"`
AuctioneerCACert string `json:"auctioneer_ca_cert,omitempty"`
Expand Down Expand Up @@ -97,7 +98,8 @@ func DefaultConfig() BBSConfig {
TaskCallbackWorkers: 1000,
DropsondePort: 3457,
DatabaseDriver: "mysql",
MaxDatabaseConnections: 200,
MaxOpenDatabaseConnections: 200,
MaxIdleDatabaseConnections: 50,
AuctioneerRequireTLS: false,
RepClientSessionCacheSize: 0,
RepRequireTLS: false,
Expand Down
6 changes: 4 additions & 2 deletions cmd/bbs/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ var _ = Describe("BBSConfig", func() {
"dropsonde_port": 3457,
"database_connection_string": "",
"database_driver": "postgres",
"max_database_connections": 500,
"max_open_database_connections": 200,
"max_idle_database_connections": 50,
"sql_ca_cert_file": "/var/vcap/jobs/bbs/config/sql.ca",
"auctioneer_address": "https://auctioneer.service.cf.internal:9016",
"auctioneer_ca_cert": "/var/vcap/jobs/bbs/config/auctioneer.ca",
Expand Down Expand Up @@ -119,7 +120,8 @@ var _ = Describe("BBSConfig", func() {
TaskCallbackWorkers: 1000,
DropsondePort: 3457,
DatabaseDriver: "postgres",
MaxDatabaseConnections: 500,
MaxOpenDatabaseConnections: 200,
MaxIdleDatabaseConnections: 50,
SQLCACertFile: "/var/vcap/jobs/bbs/config/sql.ca",
AuctioneerAddress: "https://auctioneer.service.cf.internal:9016",
AuctioneerCACert: "/var/vcap/jobs/bbs/config/auctioneer.ca",
Expand Down
4 changes: 2 additions & 2 deletions cmd/bbs/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ func main() {
logger.Fatal("failed-to-open-sql", err)
}
defer sqlConn.Close()
sqlConn.SetMaxOpenConns(bbsConfig.MaxDatabaseConnections)
sqlConn.SetMaxIdleConns(bbsConfig.MaxDatabaseConnections)
sqlConn.SetMaxOpenConns(bbsConfig.MaxOpenDatabaseConnections)
sqlConn.SetMaxIdleConns(bbsConfig.MaxIdleDatabaseConnections)

err = sqlConn.Ping()
if err != nil {
Expand Down