Commit df009620 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Update config defaults.

parent e58b7e9f

main.go

+6 −4
Original line number Diff line number Diff line
@@ -130,16 +130,15 @@ func main() { 
}



func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) {

	// TODO config database pooling

	rawurl := fmt.Sprintf("postgresql://%s", config.GetDatabase().Addresses[0])

	url, err := url.Parse(rawurl)

	parsedUrl, err := url.Parse(rawurl)

	if err != nil {

		multiLogger.Fatal("Bad database connection URL", zap.Error(err))

	}

	query := url.Query()

	query := parsedUrl.Query()

	if len(query.Get("sslmode")) == 0 {

		query.Set("sslmode", "disable")

		url.RawQuery = query.Encode()

		parsedUrl.RawQuery = query.Encode()

	}



	if len(parsedUrl.Path) < 1 {
@@ -154,6 +153,9 @@ func dbConnect(multiLogger *zap.Logger, config server.Config) (*sql.DB, string) 
	if err != nil {

		multiLogger.Fatal("Error pinging database", zap.Error(err))

	}

	db.SetConnMaxLifetime(time.Millisecond * time.Duration(config.GetDatabase().ConnMaxLifetimeMs))

	db.SetMaxOpenConns(config.GetDatabase().MaxOpenConns)

	db.SetMaxIdleConns(config.GetDatabase().MaxIdleConns)



	db.SetConnMaxLifetime(time.Millisecond * time.Duration(config.GetDatabase().ConnMaxLifetimeMs))

	db.SetMaxOpenConns(config.GetDatabase().MaxOpenConns)

server/config.go

+2 −2
Original line number Diff line number Diff line
@@ -246,9 +246,9 @@ type DatabaseConfig struct { 
func NewDatabaseConfig() *DatabaseConfig {

	return &DatabaseConfig{

		Addresses:         []string{"root@localhost:26257"},

		ConnMaxLifetimeMs: 60000,

		ConnMaxLifetimeMs: 0,

		MaxOpenConns:      0,

		MaxIdleConns:      0,

		MaxIdleConns:      2,

	}

}