From 663cefb28182e038c93ce76f44530dc9847d1fc8 Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Fri, 16 Jun 2023 11:02:46 +0800
Subject: [PATCH] modify httphandler.galaops.sendjsonmode

---
 gala-ops/server/httphandler/component.go | 19 +++++++++----------
 gala-ops/server/main.go                  |  6 +++---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/gala-ops/server/httphandler/component.go b/gala-ops/server/httphandler/component.go
index 183ef4e5..f15c9619 100644
--- a/gala-ops/server/httphandler/component.go
+++ b/gala-ops/server/httphandler/component.go
@@ -99,7 +99,7 @@ func (o *Opsclient) Getplugininfo(pilotgoserver string, pluginname string) (map[
 	return PromePlugin, nil
 }
 
-func (o *Opsclient) SendJsonMode(jsonmodeURL string) (string, error) {
+func (o *Opsclient) SendJsonMode(jsonmodeURL string) (string, int, error) {
 	url := Galaops.PromePlugin["url"].(string) + jsonmodeURL
 
 	_, thisfile, _, _ := runtime.Caller(0)
@@ -109,30 +109,29 @@ func (o *Opsclient) SendJsonMode(jsonmodeURL string) (string, error) {
 		if err != nil {
 			return err
 		}
-
 		if !info.Mode().IsRegular() {
 			return nil
 		}
-
 		data, err := os.ReadFile(jsonfilepath)
 		if err != nil {
 			return err
 		}
-
 		_, jsonfilename := filepath.Split(jsonfilepath)
 		files[strings.Split(jsonfilename, ".")[0]] = string(data)
-
 		return nil
 	})
 	if err != nil {
-		return "", err
+		return "", -1, err
 	}
 
-	bs, err := httputils.Post(url, &httputils.Params{
+	resp, err := httputils.Post(url, &httputils.Params{
 		Body: files,
 	})
-	if err != nil {
-		return "", err
+	if resp != nil {
+		if err != nil || resp.StatusCode != 201 {
+			return "", resp.StatusCode, err
+		}
+		return string(resp.Body), resp.StatusCode, nil
 	}
-	return string(bs), nil
+	return "the target web server does not exist", -1, err
 }
diff --git a/gala-ops/server/main.go b/gala-ops/server/main.go
index 824b3241..bb6f2cb0 100644
--- a/gala-ops/server/main.go
+++ b/gala-ops/server/main.go
@@ -54,9 +54,9 @@ func main() {
 	httphandler.Galaops.PromePlugin = promeplugin
 
 	// 向prometheus插件发送可视化插件json模板
-	_, err = httphandler.Galaops.SendJsonMode("")
-	if err != nil {
-		logger.Error("failed to sendjsonmode to prometheus plugin: ", err)
+	respbody, retcode, err := httphandler.Galaops.SendJsonMode("/abc")
+	if err != nil || retcode != 201 {
+		logger.Error("failed to sendjsonmode to prometheus plugin: ", respbody, retcode, err)
 	}
 
 	// 设置router
-- 
Gitee