优化结构

internal/data/data.go

@@ -176,6 +176,34 @@ func NewData(runtime *conf.Runtime, appLogger *slog.Logger, storageManager *stor
 		c.Database = &conf.Data_Database{}
 	}
 	d := &Data{runtime: runtime, integrations: runtimeconfig.NewStore(), appLogger: appLogger, storage: storageManager, catalog: catalog}
+	var stopConfigWatcher func()
+	var cleanupOnce sync.Once
+	cleanup := func() {
+		cleanupOnce.Do(func() {
+			if stopConfigWatcher != nil {
+				stopConfigWatcher()
+			}
+			if d.auditLog != nil {
+				d.auditLog.Close()
+			}
+			if d.gormDB != nil {
+				d.gormDB.close()
+			}
+			closeDatabaseList(d.dbList)
+			if d.redis != nil {
+				d.redis.close()
+			}
+			if d.mongo != nil {
+				d.mongo.close()
+			}
+		})
+	}
+	initialized := false
+	defer func() {
+		if !initialized {
+			cleanup()
+		}
+	}()
 	usingFallback := !databaseConnectionConfigured(c.Database)
 	var db *gorm.DB
 	var err error
@@ -199,8 +227,6 @@ func NewData(runtime *conf.Runtime, appLogger *slog.Logger, storageManager *stor
 	d.auditLog = newDataScopeAuditWriter(d, appLogger)
 	d.dbList, err = openDatabaseList(c.DatabaseList, appLogger)
 	if err != nil {
-		d.auditLog.Close()
-		d.gormDB.close()
 		return nil, nil, err
 	}
 	for _, item := range d.dbList {
@@ -256,15 +282,8 @@ func NewData(runtime *conf.Runtime, appLogger *slog.Logger, storageManager *stor
 		mongoClient = nil
 	}
 	d.mongo = newReloadableMongo(mongoClient)
-	stopConfigWatcher := d.watchConfig()
-	cleanup := func() {
-		stopConfigWatcher()
-		d.auditLog.Close()
-		d.gormDB.close()
-		closeDatabaseList(d.dbList)
-		d.redis.close()
-		d.mongo.close()
-	}
+	stopConfigWatcher = d.watchConfig()
+	initialized = true
 	return d, cleanup, nil
 }