优化结构
This commit is contained in:
+4
-56
@@ -122,55 +122,6 @@ func (d *Data) RedisClient() redis.UniversalClient {
|
||||
return d.redis.load()
|
||||
}
|
||||
|
||||
// MongoClient returns the currently active Mongo client. The client remains
|
||||
// owned by Data and is only exposed here for framework-level resource wiring.
|
||||
func (d *Data) MongoClient() *mongo.Client {
|
||||
if d == nil || d.mongo == nil {
|
||||
return nil
|
||||
}
|
||||
return d.mongo.load()
|
||||
}
|
||||
|
||||
// NamedDatabases returns a copy of configured secondary database handles for
|
||||
// the process-wide resource registry. Data retains lifecycle ownership.
|
||||
func (d *Data) NamedDatabases() map[string]*gorm.DB {
|
||||
if d == nil {
|
||||
return nil
|
||||
}
|
||||
d.dbListMu.RLock()
|
||||
defer d.dbListMu.RUnlock()
|
||||
if len(d.dbList) == 0 {
|
||||
return nil
|
||||
}
|
||||
result := make(map[string]*gorm.DB, len(d.dbList))
|
||||
for name, db := range d.dbList {
|
||||
if name != "" && db != nil {
|
||||
result[name] = db
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// NamedRedisClients returns a copy of configured secondary Redis handles for
|
||||
// the process-wide resource registry. Data retains lifecycle ownership.
|
||||
func (d *Data) NamedRedisClients() map[string]redis.UniversalClient {
|
||||
if d == nil {
|
||||
return nil
|
||||
}
|
||||
d.redisListMu.RLock()
|
||||
defer d.redisListMu.RUnlock()
|
||||
if len(d.redisList) == 0 {
|
||||
return nil
|
||||
}
|
||||
result := make(map[string]redis.UniversalClient, len(d.redisList))
|
||||
for name, client := range d.redisList {
|
||||
if name != "" && client != nil {
|
||||
result[name] = client
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (d *Data) logger() *slog.Logger {
|
||||
if d != nil && d.appLogger != nil {
|
||||
return d.appLogger
|
||||
@@ -262,12 +213,9 @@ func NewData(runtime *config.Store, appLogger *slog.Logger, storageManager *stor
|
||||
}
|
||||
})
|
||||
}
|
||||
initialized := false
|
||||
defer func() {
|
||||
if !initialized {
|
||||
cleanup()
|
||||
}
|
||||
}()
|
||||
var undo rollback
|
||||
undo.add(cleanup)
|
||||
defer undo.run()
|
||||
usingFallback := !databaseConnectionConfigured(c.Database)
|
||||
var db *gorm.DB
|
||||
var err error
|
||||
@@ -348,7 +296,7 @@ func NewData(runtime *config.Store, appLogger *slog.Logger, storageManager *stor
|
||||
mongoClient = nil
|
||||
}
|
||||
d.mongo = newReloadable(mongoClient, closeMongoClient)
|
||||
initialized = true
|
||||
undo.commit()
|
||||
return d, cleanup, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user