@@ -180,92 +180,22 @@ func Run() {
180180 }
181181
182182 if requires .NetworkDBs {
183- db .WriterDb , db .ReaderDb = db .MustInitDB (& types.DatabaseConfig {
184- Username : cfg .WriterDatabase .Username ,
185- Password : cfg .WriterDatabase .Password ,
186- Name : cfg .WriterDatabase .Name ,
187- Host : cfg .WriterDatabase .Host ,
188- Port : cfg .WriterDatabase .Port ,
189- MaxOpenConns : cfg .WriterDatabase .MaxOpenConns ,
190- MaxIdleConns : cfg .WriterDatabase .MaxIdleConns ,
191- SSL : cfg .WriterDatabase .SSL ,
192- }, & types.DatabaseConfig {
193- Username : cfg .ReaderDatabase .Username ,
194- Password : cfg .ReaderDatabase .Password ,
195- Name : cfg .ReaderDatabase .Name ,
196- Host : cfg .ReaderDatabase .Host ,
197- Port : cfg .ReaderDatabase .Port ,
198- MaxOpenConns : cfg .ReaderDatabase .MaxOpenConns ,
199- MaxIdleConns : cfg .ReaderDatabase .MaxIdleConns ,
200- SSL : cfg .ReaderDatabase .SSL ,
201- }, "pgx" , "postgres" )
183+ db .WriterDb , db .ReaderDb = db .MustInitDB (& cfg .WriterDatabase , & cfg .ReaderDatabase , "pgx" , "postgres" )
202184 defer db .ReaderDb .Close ()
203185 defer db .WriterDb .Close ()
204186
205- db .AlloyWriter , db .AlloyReader = db .MustInitDB (& types.DatabaseConfig {
206- Username : cfg .AlloyWriter .Username ,
207- Password : cfg .AlloyWriter .Password ,
208- Name : cfg .AlloyWriter .Name ,
209- Host : cfg .AlloyWriter .Host ,
210- Port : cfg .AlloyWriter .Port ,
211- MaxOpenConns : cfg .AlloyWriter .MaxOpenConns ,
212- MaxIdleConns : cfg .AlloyWriter .MaxIdleConns ,
213- SSL : cfg .AlloyWriter .SSL ,
214- }, & types.DatabaseConfig {
215- Username : cfg .AlloyReader .Username ,
216- Password : cfg .AlloyReader .Password ,
217- Name : cfg .AlloyReader .Name ,
218- Host : cfg .AlloyReader .Host ,
219- Port : cfg .AlloyReader .Port ,
220- MaxOpenConns : cfg .AlloyReader .MaxOpenConns ,
221- MaxIdleConns : cfg .AlloyReader .MaxIdleConns ,
222- SSL : cfg .AlloyReader .SSL ,
223- }, "pgx" , "postgres" )
187+ db .AlloyWriter , db .AlloyReader = db .MustInitDB (& cfg .AlloyWriter , & cfg .AlloyReader , "pgx" , "postgres" )
224188 defer db .AlloyReader .Close ()
225189 defer db .AlloyWriter .Close ()
226190 }
227191 if requires .UserDBs {
228- db .FrontendWriterDB , db .FrontendReaderDB = db .MustInitDB (& types.DatabaseConfig {
229- Username : cfg .Frontend .WriterDatabase .Username ,
230- Password : cfg .Frontend .WriterDatabase .Password ,
231- Name : cfg .Frontend .WriterDatabase .Name ,
232- Host : cfg .Frontend .WriterDatabase .Host ,
233- Port : cfg .Frontend .WriterDatabase .Port ,
234- MaxOpenConns : cfg .Frontend .WriterDatabase .MaxOpenConns ,
235- MaxIdleConns : cfg .Frontend .WriterDatabase .MaxIdleConns ,
236- }, & types.DatabaseConfig {
237- Username : cfg .Frontend .ReaderDatabase .Username ,
238- Password : cfg .Frontend .ReaderDatabase .Password ,
239- Name : cfg .Frontend .ReaderDatabase .Name ,
240- Host : cfg .Frontend .ReaderDatabase .Host ,
241- Port : cfg .Frontend .ReaderDatabase .Port ,
242- MaxOpenConns : cfg .Frontend .ReaderDatabase .MaxOpenConns ,
243- MaxIdleConns : cfg .Frontend .ReaderDatabase .MaxIdleConns ,
244- }, "pgx" , "postgres" )
192+ db .FrontendWriterDB , db .FrontendReaderDB = db .MustInitDB (& cfg .Frontend .WriterDatabase , & cfg .Frontend .ReaderDatabase , "pgx" , "postgres" )
245193 defer db .FrontendReaderDB .Close ()
246194 defer db .FrontendWriterDB .Close ()
247195 }
248196
249197 // clickhouse
250- db .ClickHouseWriter , db .ClickHouseReader = db .MustInitDB (& types.DatabaseConfig {
251- Username : cfg .ClickHouse .WriterDatabase .Username ,
252- Password : cfg .ClickHouse .WriterDatabase .Password ,
253- Name : cfg .ClickHouse .WriterDatabase .Name ,
254- Host : cfg .ClickHouse .WriterDatabase .Host ,
255- Port : cfg .ClickHouse .WriterDatabase .Port ,
256- MaxOpenConns : cfg .ClickHouse .WriterDatabase .MaxOpenConns ,
257- SSL : true ,
258- MaxIdleConns : cfg .ClickHouse .WriterDatabase .MaxIdleConns ,
259- }, & types.DatabaseConfig {
260- Username : cfg .ClickHouse .ReaderDatabase .Username ,
261- Password : cfg .ClickHouse .ReaderDatabase .Password ,
262- Name : cfg .ClickHouse .ReaderDatabase .Name ,
263- Host : cfg .ClickHouse .ReaderDatabase .Host ,
264- Port : cfg .ClickHouse .ReaderDatabase .Port ,
265- MaxOpenConns : cfg .ClickHouse .ReaderDatabase .MaxOpenConns ,
266- SSL : true ,
267- MaxIdleConns : cfg .ClickHouse .ReaderDatabase .MaxIdleConns ,
268- }, "clickhouse" , "clickhouse" )
198+ db .ClickHouseWriter , db .ClickHouseReader = db .MustInitDB (& cfg .ClickHouse .WriterDatabase , & cfg .ClickHouse .ReaderDatabase , "clickhouse" , "clickhouse" )
269199 defer db .ClickHouseReader .Close ()
270200 defer db .ClickHouseWriter .Close ()
271201
0 commit comments