Merge pull request #17279 from karalabe/puppeth-banlist-fix

cmd/puppeth: split banned ethstats addresses over columns

cmd/puppeth/module_ethstats.go

@@ -122,7 +122,7 @@ func (info *ethstatsInfos) Report() map[string]string {
 		"Website address":       info.host,
 		"Website listener port": strconv.Itoa(info.port),
 		"Login secret":          info.secret,
-		"Banned addresses":      fmt.Sprintf("%v", info.banned),
+		"Banned addresses":      strings.Join(info.banned, "\n"),
 	}
 }
 

cmd/puppeth/wizard_netstats.go

@@ -203,7 +203,7 @@ func (stats serverStats) render() {
 
 	table.SetHeader([]string{"Server", "Address", "Service", "Config", "Value"})
 	table.SetAlignment(tablewriter.ALIGN_LEFT)
-	table.SetColWidth(100)
+	table.SetColWidth(40)
 
 	// Find the longest lines for all columns for the hacked separator
 	separator := make([]string, 5)
@@ -222,8 +222,10 @@ func (stats serverStats) render() {
 				if len(config) > len(separator[3]) {
 					separator[3] = strings.Repeat("-", len(config))
 				}
-				if len(value) > len(separator[4]) {
+				for _, val := range strings.Split(value, "\n") {
-					separator[4] = strings.Repeat("-", len(value))
+					if len(val) > len(separator[4]) {
+						separator[4] = strings.Repeat("-", len(val))
+					}
 				}
 			}
 		}
@@ -263,13 +265,17 @@ func (stats serverStats) render() {
 			sort.Strings(configs)
 
 			for k, config := range configs {
-				switch {
+				for l, value := range strings.Split(stats[server].services[service][config], "\n") {
-				case j == 0 && k == 0:
+					switch {
-					table.Append([]string{server, stats[server].address, service, config, stats[server].services[service][config]})
+					case j == 0 && k == 0 && l == 0:
-				case k == 0:
+						table.Append([]string{server, stats[server].address, service, config, value})
-					table.Append([]string{"", "", service, config, stats[server].services[service][config]})
+					case k == 0 && l == 0:
-				default:
+						table.Append([]string{"", "", service, config, value})
-					table.Append([]string{"", "", "", config, stats[server].services[service][config]})
+					case l == 0:
+						table.Append([]string{"", "", "", config, value})
+					default:
+						table.Append([]string{"", "", "", "", value})
+					}
 				}
 			}
 		}