Fix pprof service related flag and config migration tests

harmony-one · Jul 9, 2021 · e750a99 · e750a99
1 parent ec72821
commit e750a99
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/cmd/harmony/config_migrations.go b/cmd/harmony/config_migrations.go
@@ -177,13 +177,13 @@ func init() {
 			confTree.Set("Pprof.Folder", defaultConfig.Pprof.Folder)
 		}
 		if confTree.Get("Pprof.ProfileNames") == nil {
-			confTree.Set("Pprof.ProfileNames", []string{})
+			confTree.Set("Pprof.ProfileNames", make([]interface{}, 0))
 		}
 		if confTree.Get("Pprof.ProfileIntervals") == nil {
-			confTree.Set("Pprof.ProfileIntervals", []string{})
+			confTree.Set("Pprof.ProfileIntervals", make([]interface{}, 0))
 		}
 		if confTree.Get("Pprof.ProfileDebugValues") == nil {
-			confTree.Set("Pprof.ProfileDebugValues", []string{})
+			confTree.Set("Pprof.ProfileDebugValues", make([]interface{}, 0))
 		}
 
 		confTree.Set("Version", "2.2.0")

diff --git a/cmd/harmony/default.go b/cmd/harmony/default.go
@@ -63,10 +63,12 @@ var defaultConfig = harmonyconfig.HarmonyConfig{
 	},
 	Sync: getDefaultSyncConfig(defNetworkType),
 	Pprof: harmonyconfig.PprofConfig{
-		Enabled:      false,
-		ListenAddr:   "127.0.0.1:6060",
-		Folder:       "./profiles",
-		ProfileNames: []string{},
+		Enabled:            false,
+		ListenAddr:         "127.0.0.1:6060",
+		Folder:             "./profiles",
+		ProfileNames:       []string{},
+		ProfileIntervals:   []int{},
+		ProfileDebugValues: []int{},
 	},
 	Log: harmonyconfig.LogConfig{
 		Folder:     "./latest",

diff --git a/cmd/harmony/flags_test.go b/cmd/harmony/flags_test.go
@@ -98,10 +98,12 @@ func TestHarmonyFlags(t *testing.T) {
 					BlacklistFile: "./.hmy/blacklist.txt",
 				},
 				Pprof: harmonyconfig.PprofConfig{
-					Enabled:      false,
-					ListenAddr:   "127.0.0.1:6060",
-					Folder:       "./profiles",
-					ProfileNames: []string{},
+					Enabled:            false,
+					ListenAddr:         "127.0.0.1:6060",
+					Folder:             "./profiles",
+					ProfileNames:       []string{},
+					ProfileIntervals:   []int{},
+					ProfileDebugValues: []int{},
 				},
 				Log: harmonyconfig.LogConfig{
 					Folder:     "./latest",

diff --git a/internal/configs/harmony/harmony.go b/internal/configs/harmony/harmony.go
@@ -91,8 +91,8 @@ type PprofConfig struct {
 	ListenAddr         string
 	Folder             string
 	ProfileNames       []string
-	ProfileIntervals   []int `toml:",omitempty"`
-	ProfileDebugValues []int `toml:",omitempty"`
+	ProfileIntervals   []int
+	ProfileDebugValues []int
 }
 
 type LogConfig struct {