From baa2a4dd40899290fd39131077bed9625b0b986a Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Wed, 7 Jun 2023 15:26:43 +0800
Subject: [PATCH] Refactor container plugin based on Grafana plugin

---
 container/server/client/client.go             | 30 -----------
 container/server/httphandler/pluginmanager.go | 15 ------
 container/server/main.go                      | 50 +++++++++++++------
 3 files changed, 36 insertions(+), 59 deletions(-)
 delete mode 100644 container/server/client/client.go
 delete mode 100644 container/server/httphandler/pluginmanager.go

diff --git a/container/server/client/client.go b/container/server/client/client.go
deleted file mode 100644
index 3d55b1bc..00000000
--- a/container/server/client/client.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package client
-
-import (
-	splugin "gitee.com/openeuler/PilotGo-plugins/sdk/plugin"
-	"openeuler.org/PilotGo/container-plugin/config"
-)
-
-const Version = "0.0.1"
-
-var globalClient *splugin.Client
-
-func init() {
-	globalClient = splugin.DefaultClient(&splugin.PluginInfo{
-		Name:        "container",
-		Version:     Version,
-		Description: "Container management plugin",
-		Author:      "wangjunqi",
-		Email:       "wangjunqi@kylinos.cn",
-		Url:         "http://192.168.75.100:9998/plugin/container",
-		// ReverseDest: "",
-	}, config.Config().Logopts)
-}
-
-func Client() *splugin.Client {
-	return globalClient
-}
-
-func StartClient(conf *config.HttpConf) {
-	globalClient.Serve(conf.Addr)
-}
diff --git a/container/server/httphandler/pluginmanager.go b/container/server/httphandler/pluginmanager.go
deleted file mode 100644
index 5445efb1..00000000
--- a/container/server/httphandler/pluginmanager.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package httphandler
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"openeuler.org/PilotGo/container-plugin/client"
-)
-
-func PluginInfo(ctx *gin.Context) {
-	plugin_info := client.Client().Plugin
-	client.Client().Server = "http://" + ctx.Request.RemoteAddr
-
-	ctx.JSON(http.StatusOK, plugin_info)
-}
diff --git a/container/server/main.go b/container/server/main.go
index 54d5645c..53e3873e 100644
--- a/container/server/main.go
+++ b/container/server/main.go
@@ -4,36 +4,58 @@ import (
 	"fmt"
 	"os"
 
+	"gitee.com/openeuler/PilotGo-plugins/sdk/logger"
+	"gitee.com/openeuler/PilotGo-plugins/sdk/plugin/client"
 	"github.com/gin-gonic/gin"
-
-	"openeuler.org/PilotGo/container-plugin/client"
 	"openeuler.org/PilotGo/container-plugin/config"
 	"openeuler.org/PilotGo/container-plugin/database"
 	"openeuler.org/PilotGo/container-plugin/httphandler"
 )
 
-func main() {
-	fmt.Println("hello container")
+const Version = "0.0.1"
 
-	// config.Init()
+var PluginInfo = &client.PluginInfo{
+	Name:        "container",
+	Version:     Version,
+	Description: "Container management plugin",
+	Author:      "wangjunqi",
+	Email:       "wangjunqi@kylinos.cn",
+	Url:         "http://192.168.75.100:9998/plugin/container",
+	// ReverseDest: "",
+}
+
+func main() {
+	fmt.Println("hello gala-ops")
 
 	if err := database.MysqlInit(config.Config().Mysql); err != nil {
 		fmt.Println("failed to initialize database")
 		os.Exit(-1)
 	}
 
-	engine := client.Client().HttpEngine
-	registerHandlers(engine)
-	client.StartClient(config.Config().Http)
+	InitLogger()
+
+	server := gin.Default()
+
+	GlobalClient := client.DefaultClient(PluginInfo)
+	// 临时给server赋值
+	GlobalClient.Server = "http://192.168.75.100:8888"
+	GlobalClient.RegisterHandlers(server)
+	InitRouter(server)
+
+	if err := server.Run(config.Config().Http.Addr); err != nil {
+		logger.Fatal("failed to run server")
+	}
 }
 
-func registerHandlers(engine *gin.Engine) {
-	manager := engine.Group("/plugin_manage")
-	{
-		manager.GET("/info", httphandler.PluginInfo)
+func InitLogger() {
+	if err := logger.Init(config.Config().Logopts); err != nil {
+		fmt.Printf("logger init failed, please check the config file: %s", err)
+		os.Exit(-1)
 	}
-	
-	api := engine.Group("/plugin/container/api")
+}
+
+func InitRouter(router *gin.Engine) {
+	api := router.Group("/plugin/container/api")
 	{
 		api.POST("/deploy_docker", httphandler.DeployDocker)
 	}
-- 
Gitee