From 0a9a3cc3a517cdabfc213f46c2bf8a4ab95ce7c3 Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Wed, 26 Jun 2024 16:22:46 +0800
Subject: [PATCH] server/errormanager: motify struct name in errormanager

---
 server/errormanager/errormanager.go | 26 +++++++++++++-------------
 server/errormanager/meta.go         |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/server/errormanager/errormanager.go b/server/errormanager/errormanager.go
index ba373bb..f086a1e 100644
--- a/server/errormanager/errormanager.go
+++ b/server/errormanager/errormanager.go
@@ -14,14 +14,14 @@ import (
 var Global_ErrorManager *ErrorManager
 
 type ErrorManager struct {
-	ErrCh chan *Topoerror
+	ErrCh chan *ElkPluginError
 
 	Out io.Writer
 }
 
 func InitErrorManager() {
 	Global_ErrorManager = &ErrorManager{
-		ErrCh: make(chan *Topoerror, 20),
+		ErrCh: make(chan *ElkPluginError, 20),
 	}
 
 	switch conf.Global_Config.Logopts.Driver {
@@ -35,29 +35,29 @@ func InitErrorManager() {
 		Global_ErrorManager.Out = logfile
 	}
 
-	go func(ch <-chan *Topoerror) {
-		for topoerr := range ch {
-			if topoerr.Err != nil {
-				errarr := strings.Split(errors.Cause(topoerr.Err).Error(), "**")
+	go func(ch <-chan *ElkPluginError) {
+		for elkerr := range ch {
+			if elkerr.Err != nil {
+				errarr := strings.Split(errors.Cause(elkerr.Err).Error(), "**")
 				if len(errarr) < 2 {
-					logger.Error("topoerror type required in root error (err: %+v)", topoerr.Err)
+					logger.Error("topoerror type required in root error (err: %+v)", elkerr.Err)
 					os.Exit(1)
 				}
 
 				switch errarr[1] {
 				case "debug": // 只打印最底层error的message，不展开错误链的调用栈
-					logger.Debug("%+v\n", strings.Split(errors.Cause(topoerr.Err).Error(), "**")[0])
+					logger.Debug("%+v\n", strings.Split(errors.Cause(elkerr.Err).Error(), "**")[0])
 				case "warn": // 只打印最底层error的message，不展开错误链的调用栈
-					logger.Warn("%+v\n", strings.Split(errors.Cause(topoerr.Err).Error(), "**")[0])
+					logger.Warn("%+v\n", strings.Split(errors.Cause(elkerr.Err).Error(), "**")[0])
 				case "errstack": // 打印错误链的调用栈
-					fmt.Fprintf(Global_ErrorManager.Out, "%+v\n", topoerr.Err)
+					fmt.Fprintf(Global_ErrorManager.Out, "%+v\n", elkerr.Err)
 					// errors.EORE(err)
 				case "errstackfatal": // 打印错误链的调用栈，并结束程序
-					fmt.Fprintf(Global_ErrorManager.Out, "%+v\n", topoerr.Err)
+					fmt.Fprintf(Global_ErrorManager.Out, "%+v\n", elkerr.Err)
 					// errors.EORE(err)
-					topoerr.Cancel()
+					elkerr.Cancel()
 				default:
-					fmt.Printf("only support \"debug warn errstack errstackfatal\" error type: %+v\n", topoerr.Err)
+					fmt.Printf("only support \"debug warn errstack errstackfatal\" error type: %+v\n", elkerr.Err)
 					os.Exit(1)
 				}
 			}
diff --git a/server/errormanager/meta.go b/server/errormanager/meta.go
index 11196a5..be91c91 100644
--- a/server/errormanager/meta.go
+++ b/server/errormanager/meta.go
@@ -7,7 +7,7 @@ import (
 	"gitee.com/openeuler/PilotGo/sdk/logger"
 )
 
-type Topoerror struct {
+type ElkPluginError struct {
 	Err    error
 	Cancel context.CancelFunc
 }
@@ -27,7 +27,7 @@ func ErrorTransmit(ctx context.Context, err error, exit_after_print bool) {
 
 	if exit_after_print {
 		cctx, cancelF := context.WithCancel(ctx)
-		Global_ErrorManager.ErrCh <- &Topoerror{
+		Global_ErrorManager.ErrCh <- &ElkPluginError{
 			Err:    err,
 			Cancel: cancelF,
 		}
@@ -36,7 +36,7 @@ func ErrorTransmit(ctx context.Context, err error, exit_after_print bool) {
 		os.Exit(1)
 	}
 
-	Global_ErrorManager.ErrCh <- &Topoerror{
+	Global_ErrorManager.ErrCh <- &ElkPluginError{
 		Err: err,
 	}
 }
-- 
Gitee