Skip to content

renames SQLStore config settings #229

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

Merged
merged 1 commit into from
Aug 19, 2016
Merged

renames SQLStore config settings #229

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: 3 additions & 3 deletions config/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const (
HeartBtInt string = "HeartBtInt"
FileLogPath string = "FileLogPath"
FileStorePath string = "FileStorePath"
SQLDriver string = "SQLDriver"
SQLDataSourceName string = "SQLDataSourceName"
SQLConnMaxLifetime string = "SQLConnMaxLifetime"
SQLStoreDriver string = "SQLStoreDriver"
SQLStoreDataSourceName string = "SQLStoreDataSourceName"
SQLStoreConnMaxLifetime string = "SQLStoreConnMaxLifetime"
ValidateFieldsOutOfOrder string = "ValidateFieldsOutOfOrder"
)
6 changes: 3 additions & 3 deletions config/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ FileStorePath

Directory to store sequence number and message files. Only used with FileStoreFactory.

SQLDriver
SQLStoreDriver

The name of the database driver to use (see https://github.com/golang/go/wiki/SQLDrivers for the list of available drivers). Only used with SqlStoreFactory.

SQLDataSourceName
SQLStoreDataSourceName

The driver-specific data source name of the database to use. Only used with SqlStoreFactory.

SQLConnMaxLifetime
SQLStoreConnMaxLifetime

SetConnMaxLifetime sets the maximum duration of time that a database connection may be reused (see https://golang.org/pkg/database/sql/#DB.SetConnMaxLifetime). Defaults to zero, which causes connections to be reused forever. Only used with SqlStoreFactory.

Expand Down
8 changes: 4 additions & 4 deletions sqlstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ func (f sqlStoreFactory) Create(sessionID SessionID) (msgStore MessageStore, err
if !ok {
return nil, fmt.Errorf("unknown session: %v", sessionID)
}
sqlDriver, err := sessionSettings.Setting(config.SQLDriver)
sqlDriver, err := sessionSettings.Setting(config.SQLStoreDriver)
if err != nil {
return nil, err
}
sqlDataSourceName, err := sessionSettings.Setting(config.SQLDataSourceName)
sqlDataSourceName, err := sessionSettings.Setting(config.SQLStoreDataSourceName)
if err != nil {
return nil, err
}
sqlConnMaxLifetime := 0 * time.Second
if sessionSettings.HasSetting(config.SQLConnMaxLifetime) {
sqlConnMaxLifetime, err = sessionSettings.DurationSetting(config.SQLConnMaxLifetime)
if sessionSettings.HasSetting(config.SQLStoreConnMaxLifetime) {
sqlConnMaxLifetime, err = sessionSettings.DurationSetting(config.SQLStoreConnMaxLifetime)
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions sqlstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ func (suite *SQLStoreTestSuite) SetupTest() {
sessionID := SessionID{BeginString: "FIX.4.4", SenderCompID: "SENDER", TargetCompID: "TARGET"}
settings, err := ParseSettings(strings.NewReader(fmt.Sprintf(`
[DEFAULT]
SQLDriver=%s
SQLDataSourceName=%s
SQLConnMaxLifetime=14400s
SQLStoreDriver=%s
SQLStoreDataSourceName=%s
SQLStoreConnMaxLifetime=14400s

[SESSION]
BeginString=%s
Expand Down