github/tun2socks
4
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2024-12-30 02:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add platform

Browse Source
This commit is contained in:
Jason
2019-08-16 17:11:17 +08:00
parent 2c9a7895b5
commit fb3fe646ff
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
component/session/server.go
+5 -4
View File
@@ -98,15 +98,16 @@ table, th, td {
// Statistics table
_, _ = fmt.Fprintf(w, "<p>Statistics (%d)</p>", runtime.NumGoroutine())
_, _ = fmt.Fprintf(w, "<table style=\"border=4px solid\">")
_, _ = fmt.Fprintf(w, "<tr><th>Last Refresh Time</th><th>Uptime</th><th>CPU</th><th>Mem</th><th>Disk</th><th>Total</th><th>Upload</th><th>Download</th></tr>\n")
_, _ = fmt.Fprintf(w, "<th>Platform</th><th>CPU</th><th>Mem</th><th>Disk</th><tr><th>Last Refresh Time</th><th>Uptime</th><th>Total</th><th>Upload</th><th>Download</th></tr>\n")
trafficUp := atomic.LoadInt64(&s.trafficUp)
trafficDown := atomic.LoadInt64(&s.trafficDown)
_, _ = fmt.Fprintf(w, "<tr><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td></tr>\n",
date(time.Now()),
uptime(),
_, _ = fmt.Fprintf(w, "<tr><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td><td>%v</td></tr>\n",
platform(),
cpu(),
mem(),
disk(),
date(time.Now()),
uptime(),
byteCountSI(trafficUp+trafficDown),
byteCountSI(trafficUp),
byteCountSI(trafficDown),
component/session/utils.go
+9
View File
@@ -7,6 +7,7 @@ import (
C "github.com/shirou/gopsutil/cpu"
D "github.com/shirou/gopsutil/disk"
H "github.com/shirou/gopsutil/host"
M "github.com/shirou/gopsutil/mem"
)
@@ -32,6 +33,14 @@ func disk() string {
return fmt.Sprintf("%.1f%%", d.UsedPercent)
}
func platform() string {
h, err := H.Info()
if err != nil {
return "N/A"
}
return fmt.Sprintf("%s-%s", h.Platform, h.PlatformVersion)
}
func mem() string {
m, err := M.VirtualMemory()
if err != nil {