improve module init after setup

This commit is contained in:
medcl 2022-10-24 20:08:37 +08:00
parent 9a91ca7b70
commit 9841117682
1 changed files with 8 additions and 11 deletions

19
main.go
View File

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