From 795bd0560ea7441be445114499323106c6ea9b7c Mon Sep 17 00:00:00 2001
From: mzz <2017@duck.com>
Date: Sat, 15 Jun 2024 16:41:07 +0800
Subject: [PATCH] fix: support to report all error when reloading (#540)

---
 cmd/run.go                   | 9 ++++++++-
 pkg/config_parser/section.go | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cmd/run.go b/cmd/run.go
index 633593f..16a8398 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -147,6 +147,7 @@ func Run(log *logrus.Logger, conf *config.Config, externGeoDataDirs []string) (e
 		sigs <- nil
 	}()
 	reloading := false
+	reloadingErr := error(nil)
 	isSuspend := false
 	abortConnections := false
 loop:
@@ -170,7 +171,11 @@ loop:
 				}()
 				<-readyChan
 				sdnotify.Ready()
-				_ = os.WriteFile(SignalProgressFilePath, append([]byte{consts.ReloadDone}, []byte("\nOK")...), 0644)
+				if reloadingErr == nil {
+					_ = os.WriteFile(SignalProgressFilePath, append([]byte{consts.ReloadDone}, []byte("\nOK")...), 0644)
+				} else {
+					_ = os.WriteFile(SignalProgressFilePath, append([]byte{consts.ReloadError}, []byte("\n"+reloadingErr.Error())...), 0644)
+				}
 				log.Warnln("[Reload] Finished")
 			} else {
 				// Listening error.
@@ -188,6 +193,7 @@ loop:
 			}
 			sdnotify.Reloading()
 			_ = os.WriteFile(SignalProgressFilePath, []byte{consts.ReloadProcessing}, 0644)
+			reloadingErr = nil
 
 			// Load new config.
 			abortConnections = os.Remove(AbortFile) == nil
@@ -237,6 +243,7 @@ loop:
 			log.Warnln("[Reload] Load new control plane")
 			newC, err := newControlPlane(log, obj, dnsCache, newConf, externGeoDataDirs)
 			if err != nil {
+				reloadingErr = err
 				log.WithFields(logrus.Fields{
 					"err": err,
 				}).Errorln("[Reload] Failed to reload; try to roll back configuration")
diff --git a/pkg/config_parser/section.go b/pkg/config_parser/section.go
index 5284856..1698a56 100644
--- a/pkg/config_parser/section.go
+++ b/pkg/config_parser/section.go
@@ -152,7 +152,11 @@ func (f *Function) String(compact bool, quoteVal bool, omitEmpty bool) string {
 	if !(omitEmpty && len(f.Params) == 0) {
 		builder.WriteString("(")
 		var strParamList []string
-		for _, p := range f.Params {
+		for i, p := range f.Params {
+			if i >= 5 {
+				strParamList = append(strParamList, "...")
+				break
+			}
 			strParamList = append(strParamList, p.String(compact, quoteVal))
 		}
 		if compact {