diff options
| author | Jerry Kurian <jkurian@users.noreply.github.com> | 2018-06-28 09:45:20 -0400 |
|---|---|---|
| committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-06-28 09:45:20 -0400 |
| commit | 4b2a6263547363c43dba9c320c077ad295caaf4d (patch) | |
| tree | cc44d642e78a16e8d1c83bf7d7bdc9e57bcdd6f3 /store/sqlstore | |
| parent | 66dc9a5206b318a92f5cd9b41d53abc461c4deb5 (diff) | |
| download | chat-4b2a6263547363c43dba9c320c077ad295caaf4d.tar.gz chat-4b2a6263547363c43dba9c320c077ad295caaf4d.tar.bz2 chat-4b2a6263547363c43dba9c320c077ad295caaf4d.zip | |
add MaxLifetimeconns to server (#9004)
Update e.json string names and remove console log
reorder variables
update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns
Add MaxLifetimeConns to test
Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds
Update time passed to SetConnMaxLifetime
Revert "Update time passed to SetConnMaxLifetime"
This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f.
update en.json
Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000
Diffstat (limited to 'store/sqlstore')
| -rw-r--r-- | store/sqlstore/supplier.go | 3 | ||||
| -rw-r--r-- | store/sqlstore/supplier_test.go | 32 |
2 files changed, 19 insertions, 16 deletions
diff --git a/store/sqlstore/supplier.go b/store/sqlstore/supplier.go index 1e6bdcba1..6c49d91fb 100644 --- a/store/sqlstore/supplier.go +++ b/store/sqlstore/supplier.go @@ -28,7 +28,6 @@ import ( const ( INDEX_TYPE_FULL_TEXT = "full_text" INDEX_TYPE_DEFAULT = "default" - MAX_DB_CONN_LIFETIME = 60 DB_PING_ATTEMPTS = 18 DB_PING_TIMEOUT_SECS = 10 ) @@ -218,7 +217,7 @@ func setupConnection(con_type string, dataSource string, settings *model.SqlSett db.SetMaxIdleConns(*settings.MaxIdleConns) db.SetMaxOpenConns(*settings.MaxOpenConns) - db.SetConnMaxLifetime(time.Duration(MAX_DB_CONN_LIFETIME) * time.Minute) + db.SetConnMaxLifetime(time.Duration(*settings.ConnMaxLifetimeMilliseconds) * time.Millisecond) var dbmap *gorp.DbMap diff --git a/store/sqlstore/supplier_test.go b/store/sqlstore/supplier_test.go index 5aacfbe6a..3835bd01f 100644 --- a/store/sqlstore/supplier_test.go +++ b/store/sqlstore/supplier_test.go @@ -73,17 +73,19 @@ func TestGetReplica(t *testing.T) { driverName := model.DATABASE_DRIVER_SQLITE dataSource := ":memory:" maxIdleConns := 1 + connMaxLifetimeMilliseconds := 3600000 maxOpenConns := 1 queryTimeout := 5 settings := model.SqlSettings{ - DriverName: &driverName, - DataSource: &dataSource, - MaxIdleConns: &maxIdleConns, - MaxOpenConns: &maxOpenConns, - QueryTimeout: &queryTimeout, - DataSourceReplicas: testCase.DataSourceReplicas, - DataSourceSearchReplicas: testCase.DataSourceSearchReplicas, + DriverName: &driverName, + DataSource: &dataSource, + MaxIdleConns: &maxIdleConns, + ConnMaxLifetimeMilliseconds: &connMaxLifetimeMilliseconds, + MaxOpenConns: &maxOpenConns, + QueryTimeout: &queryTimeout, + DataSourceReplicas: testCase.DataSourceReplicas, + DataSourceSearchReplicas: testCase.DataSourceSearchReplicas, } supplier := sqlstore.NewSqlSupplier(settings, nil) @@ -209,17 +211,19 @@ func TestGetAllConns(t *testing.T) { driverName := model.DATABASE_DRIVER_SQLITE dataSource := ":memory:" maxIdleConns := 1 + connMaxLifetimeMilliseconds := 3600000 maxOpenConns := 1 queryTimeout := 5 settings := model.SqlSettings{ - DriverName: &driverName, - DataSource: &dataSource, - MaxIdleConns: &maxIdleConns, - MaxOpenConns: &maxOpenConns, - QueryTimeout: &queryTimeout, - DataSourceReplicas: testCase.DataSourceReplicas, - DataSourceSearchReplicas: testCase.DataSourceSearchReplicas, + DriverName: &driverName, + DataSource: &dataSource, + MaxIdleConns: &maxIdleConns, + ConnMaxLifetimeMilliseconds: &connMaxLifetimeMilliseconds, + MaxOpenConns: &maxOpenConns, + QueryTimeout: &queryTimeout, + DataSourceReplicas: testCase.DataSourceReplicas, + DataSourceSearchReplicas: testCase.DataSourceSearchReplicas, } supplier := sqlstore.NewSqlSupplier(settings, nil) |