mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

sqlstore/store: make SetupConnection public to be used by products (#21948)

Просмотр исходного кода
Этот коммит содержится в:
Ibrahim Serdar Acikgoz
2022-12-23 14:34:48 +03:00
коммит произвёл GitHub
родитель 06745d9b61
Коммит 40cd6b1656
1 изменённых файлов: 8 добавлений и 6 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
store/sqlstore/store.go
Просмотреть файл

@@ -226,7 +226,9 @@ func New(settings model.SqlSettings, metrics einterfaces.MetricsInterface) *SqlS
return store return store
} }
func setupConnection(connType string, dataSource string, settings *model.SqlSettings) *dbsql.DB { // SetupConnection sets up the connection to the database and pings it to make sure it's alive.
// It also applies any database configuration settings that are required.
func SetupConnection(connType string, dataSource string, settings *model.SqlSettings) *dbsql.DB {
db, err := dbsql.Open(*settings.DriverName, dataSource) db, err := dbsql.Open(*settings.DriverName, dataSource)
if err != nil { if err != nil {
mlog.Fatal("Failed to open SQL connection to err.", mlog.Err(err)) mlog.Fatal("Failed to open SQL connection to err.", mlog.Err(err))
@@ -292,7 +294,7 @@ func (ss *SqlStore) initConnection() {
} }
} }
handle := setupConnection("master", dataSource, ss.settings) handle := SetupConnection("master", dataSource, ss.settings)
ss.masterX = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()), ss.masterX = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second, time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace) *ss.settings.Trace)
@@ -303,7 +305,7 @@ func (ss *SqlStore) initConnection() {
if len(ss.settings.DataSourceReplicas) > 0 { if len(ss.settings.DataSourceReplicas) > 0 {
ss.ReplicaXs = make([]*sqlxDBWrapper, len(ss.settings.DataSourceReplicas)) ss.ReplicaXs = make([]*sqlxDBWrapper, len(ss.settings.DataSourceReplicas))
for i, replica := range ss.settings.DataSourceReplicas { for i, replica := range ss.settings.DataSourceReplicas {
handle := setupConnection(fmt.Sprintf("replica-%v", i), replica, ss.settings) handle := SetupConnection(fmt.Sprintf("replica-%v", i), replica, ss.settings)
ss.ReplicaXs[i] = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()), ss.ReplicaXs[i] = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second, time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace) *ss.settings.Trace)
@@ -316,7 +318,7 @@ func (ss *SqlStore) initConnection() {
if len(ss.settings.DataSourceSearchReplicas) > 0 { if len(ss.settings.DataSourceSearchReplicas) > 0 {
ss.searchReplicaXs = make([]*sqlxDBWrapper, len(ss.settings.DataSourceSearchReplicas)) ss.searchReplicaXs = make([]*sqlxDBWrapper, len(ss.settings.DataSourceSearchReplicas))
for i, replica := range ss.settings.DataSourceSearchReplicas { for i, replica := range ss.settings.DataSourceSearchReplicas {
handle := setupConnection(fmt.Sprintf("search-replica-%v", i), replica, ss.settings) handle := SetupConnection(fmt.Sprintf("search-replica-%v", i), replica, ss.settings)
ss.searchReplicaXs[i] = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()), ss.searchReplicaXs[i] = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second, time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace) *ss.settings.Trace)
@@ -332,7 +334,7 @@ func (ss *SqlStore) initConnection() {
if src.DataSource == nil { if src.DataSource == nil {
continue continue
} }
ss.replicaLagHandles[i] = setupConnection(fmt.Sprintf(replicaLagPrefix+"-%d", i), *src.DataSource, ss.settings) ss.replicaLagHandles[i] = SetupConnection(fmt.Sprintf(replicaLagPrefix+"-%d", i), *src.DataSource, ss.settings)
} }
} }
} }
@@ -1073,7 +1075,7 @@ func (ss *SqlStore) migrate(direction migrationDirection) error {
if err != nil { if err != nil {
return err return err
} }
db := setupConnection("master", dataSource, ss.settings) db := SetupConnection("master", dataSource, ss.settings)
driver, err = ms.WithInstance(db) driver, err = ms.WithInstance(db)
defer db.Close() defer db.Close()
case model.DatabaseDriverPostgres: case model.DatabaseDriverPostgres: