From 984111768218435bd4ab0e4257a11b5d6331e598 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Mon, 24 Oct 2022 20:08:37 +0800
Subject: [PATCH] improve module init after setup

---
 main.go | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/main.go b/main.go
index f9b6a73e..d70418fe 100644
--- a/main.go
+++ b/main.go
@@ -79,7 +79,7 @@ func main() {
 		module.RegisterSystemModule(&setup1.Module{})
 		module.RegisterSystemModule(uiModule)
 
-		var initFunc= func() {
+		if !global.Env().SetupRequired(){
 			module.RegisterSystemModule(&stats.SimpleStatsModule{})
 			module.RegisterSystemModule(&elastic2.ElasticModule{})
 			module.RegisterSystemModule(&queue2.DiskQueue{})
@@ -89,15 +89,10 @@ func main() {
 			module.RegisterSystemModule(&agent.AgentModule{})
 			module.RegisterSystemModule(&metrics.MetricsModule{})
 			module.RegisterSystemModule(&security.Module{})
-		}
-
-		if !global.Env().SetupRequired(){
-			initFunc()
 		}else{
 			for _, v := range modules {
 				v.Setup()
 			}
-			setup1.RegisterSetupCallback(initFunc)
 		}
 
 		api.RegisterAPI("")
@@ -127,11 +122,7 @@ func main() {
 		module.Start()
 
 		var initFunc= func() {
-			if global.Env().SetupRequired() {
-				for _, v := range modules {
-					v.Start()
-				}
-			}
+
 
 			elastic2.InitTemplate(false)
 
@@ -148,6 +139,12 @@ func main() {
 			orm.RegisterSchemaWithIndexName(insight.Dashboard{}, "dashboard")
 			api.RegisterSchema()
 
+			if global.Env().SetupRequired() {
+				for _, v := range modules {
+					v.Start()
+				}
+			}
+
 			task1.RunWithinGroup("initialize_alerting",func(ctx context.Context) error {
 				err := alerting2.InitTasks()
 				if err != nil {