优化热加载逻辑

joe2hpimn · Oct 20, 2021 · 490a1c9 · 490a1c9
1 parent 2779e79
commit 490a1c9
Show file tree

Hide file tree

Showing 8 changed files with 272 additions and 340 deletions.
diff --git a/chart/chart.go b/chart/chart.go
@@ -29,22 +29,21 @@ func LoadFrom(dir string, prefix string) {
 	share.Walk(dir, ".json", func(root, filename string) {
 		name := share.SpecName(root, filename)
 		content := share.ReadFile(filename)
-		chart, err := LoadChart(content, name)
+		_, err := LoadChart(content, name)
 		if err != nil {
 			exception.New("%s 图表格式错误", 400, name).Ctx(filename).Throw()
 		}
-		Charts[name] = chart
 	})
 }
 
 // LoadChart 载入数据表格
 func LoadChart(source []byte, name string) (*Chart, error) {
-	chart := Chart{
+	chart := &Chart{
 		Flow: gou.Flow{
 			Name: name,
 		},
 	}
-	err := jsoniter.Unmarshal(source, &chart)
+	err := jsoniter.Unmarshal(source, chart)
 	if err != nil {
 		xlog.Println(name)
 		xlog.Println(err.Error())
@@ -53,8 +52,8 @@ func LoadChart(source []byte, name string) (*Chart, error) {
 	}
 	chart.Prepare()
 	chart.SetupAPIs()
-
-	return &chart, nil
+	Charts[name] = chart
+	return chart, nil
 }
 
 // Select 读取已加载图表

diff --git a/cmd/start.go b/cmd/start.go
@@ -79,7 +79,7 @@ var startCmd = &cobra.Command{
 
 		// 调试模式
 		if config.Conf.Mode == "debug" {
-			service.WatchChanges()
+			service.Watch(config.Conf)
 		}
 
 		service.Start()

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -8,11 +8,11 @@ import (
 
 // Load 加载业务插件
 func Load(cfg config.Config) {
-	LoadFrom(cfg.RootPlugin, "")
+	LoadFrom(cfg.RootPlugin)
 }
 
 // LoadFrom 从特定目录加载
-func LoadFrom(dir string, prefix string) {
+func LoadFrom(dir string) {
 
 	if share.DirNotExists(dir) {
 		return

diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go
@@ -12,7 +12,7 @@ import (
 func TestLoad(t *testing.T) {
 	gou.Plugins = make(map[string]*gou.Plugin)
 	Load(config.Conf)
-	LoadFrom("not a path", "404.")
+	LoadFrom("404")
 	check(t)
 }