beautiful output for statistic

Author: jim3ma

misc.go

@@ -5,6 +5,7 @@ import (
 	"container/ring"
 	"encoding/base64"
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -15,6 +16,42 @@ import (
 
 const DefaultStatsSecond = 60
 
+type ByteSize float64
+
+const (
+	_           = iota // ignore first value by assigning to blank identifier
+	KB ByteSize = 1 << (10 * iota)
+	MB
+	GB
+	TB
+	PB
+	EB
+	ZB
+	YB
+)
+
+func (b ByteSize) String() string {
+	switch {
+	case b >= YB:
+		return fmt.Sprintf("%.2fYB", b/YB)
+	case b >= ZB:
+		return fmt.Sprintf("%.2fZB", b/ZB)
+	case b >= EB:
+		return fmt.Sprintf("%.2fEB", b/EB)
+	case b >= PB:
+		return fmt.Sprintf("%.2fPB", b/PB)
+	case b >= TB:
+		return fmt.Sprintf("%.2fTB", b/TB)
+	case b >= GB:
+		return fmt.Sprintf("%.2fGB", b/GB)
+	case b >= MB:
+		return fmt.Sprintf("%.2fMB", b/MB)
+	case b >= KB:
+		return fmt.Sprintf("%.2fKB", b/KB)
+	}
+	return fmt.Sprintf("%.2fB", b)
+}
+
 // Statistic contains the traffic status
 type Statistic struct {
 	SentBytes     uint64

tunnel.go

@@ -556,14 +556,20 @@ func (t *TunnelTransport) SetCCIDChannel(c chan CCID) {
 }
 
 func (t *TunnelTransport) logStats() {
+	conn, ok := t.rw.(net.Conn)
+	if !ok {
+		return
+	}
+	info := fmt.Sprintf("local: %s, remote: %s", conn.LocalAddr(), conn.RemoteAddr())
 	for {
 		select {
 		case <-time.After(DefaultStatsSecond * time.Second):
-			log.Infof("TT: Statistic - send: %d, received: %d, total send speed: %d, total receive speed: %d",
-				t.stats.SentBytes, t.stats.ReceivedBytes, t.stats.SendSpeed(), t.stats.ReceiveSpeed())
-			log.Infof("TT: Statistic - current send speed in %d seconds: %d, current receive speed in %d seconds: %d",
-				DefaultStatsSecond, t.stats.SendSpeedSecond(DefaultStatsSecond),
-				DefaultStatsSecond, t.stats.ReceiveSpeedSecond(DefaultStatsSecond))
+			log.Infof("TT: Statistic - %s - send: %s, receive: %s, total send speed: %s/s, total receive speed: %s/s",
+				info, ByteSize(t.stats.SentBytes).String(), ByteSize(t.stats.ReceivedBytes).String(),
+				ByteSize(t.stats.SendSpeed()).String(), ByteSize(t.stats.ReceiveSpeed()).String())
+			log.Infof("TT: Statistic - %s - current send speed in %ds: %s/s, current receive speed in %ds: %s/s",
+				info, DefaultStatsSecond, ByteSize(t.stats.SendSpeedSecond(DefaultStatsSecond)).String(),
+				DefaultStatsSecond, ByteSize(t.stats.ReceiveSpeedSecond(DefaultStatsSecond)).String())
 		case <-t.quit:
 			return
 		}