main.go | 12 ++++++------ diff --git a/main.go b/main.go index e1538d1d6f8d4dd4c4f58d931486628097df34f2061e94266b3579bd19e38277..e82bb68cff96e83d25e5271242472c94535d21513576336e6013c045761620ff 100644 --- a/main.go +++ b/main.go @@ -99,7 +99,7 @@ stats = append(stats, fmt.Sprintf("%s:%s/%s", cols[0], cols[1], cols[2])) } } -func netstat(iface string) { +func netstat(iface, short string) { for cols := range bg("netstat", "-I", iface, "-n", "1") { if _, err := strconv.Atoi(cols[0]); err != nil { continue @@ -115,9 +115,9 @@ } _ = cols[0] // pkts rx _ = cols[4] // pkts tx NetM.Lock() - Net[iface] = fmt.Sprintf( + Net[short] = fmt.Sprintf( "%s:%s/%s", - iface, + short, humanize.IBytes(uint64(ibps)), humanize.IBytes(uint64(obps)), ) @@ -164,8 +164,8 @@ }() go top() go freq() go iostat() - go netstat("bridge0") - go netstat("ix0") + go netstat("bridge0", "br") + go netstat("ix0", "ix") var now time.Time var status string var cmd *exec.Cmd @@ -174,7 +174,7 @@ now = time.Now() NetM.RLock() status = fmt.Sprintf( "[%s] [%s %s] [%s %s] [%s%s %s ARC] [%s] %s", - IOs, Net["bridge0"], Net["ix0"], CPU, Freq, Swap, Mem, ARC, Flags, + IOs, Net["br"], Net["ix"], CPU, Freq, Swap, Mem, ARC, Flags, now.Format("2006-01-02 15:04:05"), ) NetM.RUnlock()