good morning!!!!

Skip to content
Snippets Groups Projects
Commit a1a4f402 authored by Garet Halliday's avatar Garet Halliday
Browse files

default settings

parent 87546bb5
No related branches found
No related tags found
No related merge requests found
...@@ -139,11 +139,21 @@ func (T *Server) addPool(name string, userCreds, serverCreds auth.Credentials, d ...@@ -139,11 +139,21 @@ func (T *Server) addPool(name string, userCreds, serverCreds auth.Credentials, d
poolOptions := pool.Options{ poolOptions := pool.Options{
Credentials: userCreds, Credentials: userCreds,
ServerReconnectInitialTime: 5 * time.Second,
ServerReconnectMaxTime: 5 * time.Second,
TrackedParameters: []strutil.CIString{
strutil.MakeCIString("client_encoding"),
strutil.MakeCIString("datestyle"),
strutil.MakeCIString("timezone"),
strutil.MakeCIString("standard_conforming_strings"),
strutil.MakeCIString("application_name"),
},
} }
switch T.opConfig.Mode { switch T.opConfig.Mode {
case "transaction": case "transaction":
poolOptions = transaction.Apply(poolOptions) poolOptions = transaction.Apply(poolOptions)
case "session": case "session":
poolOptions.ServerResetQuery = "discard all"
poolOptions = session.Apply(poolOptions) poolOptions = session.Apply(poolOptions)
default: default:
log.Printf(`unknown pool mode "%s"`, T.opConfig.Mode) log.Printf(`unknown pool mode "%s"`, T.opConfig.Mode)
...@@ -151,8 +161,14 @@ func (T *Server) addPool(name string, userCreds, serverCreds auth.Credentials, d ...@@ -151,8 +161,14 @@ func (T *Server) addPool(name string, userCreds, serverCreds auth.Credentials, d
} }
p := pool.NewPool(poolOptions) p := pool.NewPool(poolOptions)
var maxConnections int
if T.opConfig.MaxDBConnections != nil {
maxConnections = int(*T.opConfig.MaxDBConnections)
}
recipeOptions := recipe.Options{ recipeOptions := recipe.Options{
Dialer: d, Dialer: d,
MaxConnections: maxConnections,
} }
r := recipe.NewRecipe(recipeOptions) r := recipe.NewRecipe(recipeOptions)
......
...@@ -280,9 +280,9 @@ func (T *Pool) acquireServer(client *Client) *Server { ...@@ -280,9 +280,9 @@ func (T *Pool) acquireServer(client *Client) *Server {
} }
func (T *Pool) releaseServer(server *Server) { func (T *Pool) releaseServer(server *Server) {
if T.options.ServerResetQuery != "" {
server.SetState(metrics.ConnStateRunningResetQuery, uuid.Nil) server.SetState(metrics.ConnStateRunningResetQuery, uuid.Nil)
if T.options.ServerResetQuery != "" {
err := backends.QueryString(new(backends.Context), server.GetReadWriter(), T.options.ServerResetQuery) err := backends.QueryString(new(backends.Context), server.GetReadWriter(), T.options.ServerResetQuery)
if err != nil { if err != nil {
T.removeServer(server) T.removeServer(server)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment