@@ -39,29 +39,7 @@ import (
3939 "yunion.io/x/onecloud/pkg/util/dbutils"
4040)
4141
42- func InitDB (options * common_options.DBOptions ) {
43- if options .DebugSqlchemy {
44- log .Warningf ("debug Sqlchemy is turned on" )
45- sqlchemy .DEBUG_SQLCHEMY = true
46- }
47-
48- log .Infof ("Registered SQL drivers: %s" , strings .Join (sql .Drivers (), ", " ))
49-
50- consts .QueryOffsetOptimization = options .QueryOffsetOptimization
51-
52- if options .HistoricalUniqueName {
53- consts .EnableHistoricalUniqueName ()
54- } else {
55- consts .DisableHistoricalUniqueName ()
56- }
57-
58- if options .OpsLogMaxKeepMonths > 0 {
59- consts .SetSplitableMaxKeepMonths (options .OpsLogMaxKeepMonths )
60- }
61- if options .SplitableMaxDurationHours > 0 {
62- consts .SetSplitableMaxDurationHours (options .SplitableMaxDurationHours )
63- }
64-
42+ func InitDBConn (options * common_options.DBOptions ) {
6543 dialect , sqlStr , err := options .GetDBConnection ()
6644 if err != nil {
6745 log .Fatalf ("Invalid SqlConnection string: %s error: %v" , options .SqlConnection , err )
@@ -103,8 +81,10 @@ func InitDB(options *common_options.DBOptions) {
10381 dbConn .SetConnMaxLifetime (time .Duration (options .DbMaxWaitTimeoutSeconds ) * time .Second )
10482 // ConnMaxIdleTime should be half of ConnMaxLifetime
10583 dbConn .SetConnMaxIdleTime (time .Duration (options .DbMaxWaitTimeoutSeconds / 2 ) * time .Second )
84+ }
10685
107- dialect , sqlStr , err = options .GetClickhouseConnStr ()
86+ func InitClickhouseConn (options * common_options.DBOptions ) {
87+ dialect , sqlStr , err := options .GetClickhouseConnStr ()
10888 if err == nil {
10989 // connect to clickcloud
11090 // force convert sqlstr from clickhouse v2 to v1
@@ -126,6 +106,33 @@ func InitDB(options *common_options.DBOptions) {
126106 consts .OpsLogWithClickhouse = true
127107 }
128108 }
109+ }
110+
111+ func InitDB (options * common_options.DBOptions ) {
112+ if options .DebugSqlchemy {
113+ log .Warningf ("debug Sqlchemy is turned on" )
114+ sqlchemy .DEBUG_SQLCHEMY = true
115+ }
116+
117+ log .Infof ("Registered SQL drivers: %s" , strings .Join (sql .Drivers (), ", " ))
118+
119+ consts .QueryOffsetOptimization = options .QueryOffsetOptimization
120+
121+ if options .HistoricalUniqueName {
122+ consts .EnableHistoricalUniqueName ()
123+ } else {
124+ consts .DisableHistoricalUniqueName ()
125+ }
126+
127+ if options .OpsLogMaxKeepMonths > 0 {
128+ consts .SetSplitableMaxKeepMonths (options .OpsLogMaxKeepMonths )
129+ }
130+ if options .SplitableMaxDurationHours > 0 {
131+ consts .SetSplitableMaxDurationHours (options .SplitableMaxDurationHours )
132+ }
133+
134+ InitDBConn (options )
135+ InitClickhouseConn (options )
129136
130137 switch options .LockmanMethod {
131138 case common_options .LockMethodInMemory , "" :
0 commit comments