result improvment

Author: c1982

README.md

@@ -5,7 +5,6 @@ SMTP Performance Test Tool
 
 ![Bomberman Logo](https://github.com/c1982/bomberman/blob/master/logo.jpg?raw=true)
 
-
 ## Installation
 
 bomberman requires Go 1.11 or later.
@@ -16,7 +15,6 @@ $ go get github.com/c1982/bomberman
 
 or
 
-
 [download](https://github.com/c1982/bomberman/releases)
 
 ## Flags
@@ -27,16 +25,15 @@ or
 | from | From email address | 
 | to | To email address| 
 | subject | Email subject text | 
-| size | Set email size Kilobytes (1024 Kilobyte = 1Mbyte) |
+| size | Set email size Kilobytes (1024 Kilobyte = 1Mbyte). Default: 5Kb |
 | helo | SMTP client helo name. Default: mail.server.com | 
 | count | Email message count. Default: 10|
-| workers | Thread workers for SMTP client. Default: 100 |
-| jobs | Job queue lenght in workers. Default: 50 |
+| workers | Thread workers for SMTP client. Default: 10 |
+| jobs | Job queue lenght in workers. Default: 10 |
 | outbound | Outbound IP address for SMTP client |
 | showerror | Print SMTP errors |
 | balance | Tool is use all IP address for outbound ip with sequental balance. Defalut: false |
 
-
 ## Server Configuration Checklist
 
 * Set SPF value in from email address domain.
@@ -45,7 +42,7 @@ or
 
 ## Usage
 
-Send 10 email to mail.server.com:25 50 workers
+Send 50 email to mail.server.com:25 50 workers
 
 ```
 ./bomberman -host=mail.server.com:25 [email protected] [email protected] -workers=50 -jobs=50 -count=50 -size=75 -balance
@@ -72,7 +69,7 @@ Source IP Stats:
 
 Destination IP Stats:
 
-5.4.0.248:25	: 856
+5.4.0.248:25            : 856
 
 SMTP Commands:
 
@@ -81,7 +78,7 @@ DIAL (1022)	        : min. 27.323µs, max. 6.000565014s, med. 1.511920428s
 HELO (854)	        : min. 34.061919ms, max. 3.80865823s, med. 343.306129ms
 MAIL (854)	        : min. 42.455906ms, max. 6.150506182s, med. 943.313477ms
 RCPT (854)	        : min. 34.972014ms, max. 3.151397545s, med. 497.683671ms
-SUCCESS (854)	    : min. 1.480909163s, max. 37.223728269s, med. 15.673002296s
+SUCCESS (854)           : min. 1.480909163s, max. 37.223728269s, med. 15.673002296s
 TOUCH (854)	        : min. 112.109537ms, max. 17.759899662s, med. 3.985871341s
 ```
 

main.go

@@ -37,9 +37,9 @@ const (
 	metricTemplate = `` +
 		`Bomberman - SMTP Performance Test Tool` + "\n" +
 		`--------------------------------------` + "\n" +
-		`Message Count		: %d` + "\n" +
-		`Message Size		: %dK` + "\n" +
+		`Count			: %d` + "\n" +
 		`Error			: %d` + "\n" +
+		`Size			: %dK` + "\n" +
 		`Start			: %v` + "\n" +
 		`End			: %v` + "\n" +
 		`Time			: %v` + "\n"
@@ -87,7 +87,7 @@ func usage() {
 	fmt.Fprintln(os.Stderr, "OPTIONS:")
 	flag.PrintDefaults()
 	fmt.Fprintln(os.Stderr, "USAGE:")
-	fmt.Fprintln(os.Stderr, "./bomberman -host=mail.server.com:25 [email protected] [email protected] -workers=100 -jobs=100 -count=100 -outbound=YOUR_PUBLIC_IP -helo=mydomain.com -subject=\"Test Email\"")
+	fmt.Fprintln(os.Stderr, "./bomberman -host=mail.server.com:25 [email protected] [email protected] -workers=100 -jobs=100 -count=100 -helo=mydomain.com -balance -size=2")
 	fmt.Fprintln(os.Stderr, "")
 }
 
@@ -123,12 +123,10 @@ func printResults(balanced bool, startTime, endtime time.Time) {
 	}
 
 	if len(metric.DstIPStats) > 1 {
-
 		fmt.Println("")
 		fmt.Println("Destination IP Stats:")
 		fmt.Println("")
 		printSlice(metric.DstIPStats, "%s\t: %d\n")
-
 	}
 
 	fmt.Println("")
@@ -143,6 +141,7 @@ func printResults(balanced bool, startTime, endtime time.Time) {
 		cnt := countMetric(m, metric.Durations)
 		fmt.Printf("%s (%d)\t: min. %v, max. %v, med. %v\n", m, cnt, min, max, me)
 	}
+	fmt.Println("")
 }
 
 func start() {
@@ -187,9 +186,11 @@ func start() {
 				metric.ErrorCnt++
 			}
 
-			metric.DstIPStats = append(metric.DstIPStats, remoteip)
-			metric.Durations = append(metric.Durations, durs)
+			if remoteip != "" {
+				metric.DstIPStats = append(metric.DstIPStats, remoteip)
+			}
 
+			metric.Durations = append(metric.Durations, durs)
 		}
 	}
 
@@ -267,12 +268,7 @@ func sendMail(outbound, smtpServer, from, to, subject, body, helo string) (metri
 
 	dataTime := time.Now()
 
-	msg = ""
-	msg += fmt.Sprintf("from: <%s>\r\n", from)
-	msg += fmt.Sprintf("to: %s\r\n", to)
-	msg += fmt.Sprintf("Subject: %s\r\n", subject)
-	msg += fmt.Sprintf("\r\n%s", body)
-
+	msg = fmt.Sprintf(bodyTemplate, from, to, subject, body)
 	wc, err = c.Data()
 
 	if err != nil {