anonfunc/rtt-polybar-waybar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some code cleanup; retry dns resolve

Browse Source
This commit is contained in:
Giovanni Harting
2024-05-01 13:35:25 +02:00
parent e992535fc1
commit b58a59675c
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rtt.go
View File

@@ -71,13 +71,15 @@ func formatLinePolybar(stats *PingStats) {
packetColor = fmt.Sprintf("%%{F#%s}", *CritColor) packetColor = fmt.Sprintf("%%{F#%s}", *CritColor)
} }
fmt.Printf("%s\uE4E2 %d \uE43C %dms %s\uF1B2 %d%%\n", rttColor, stats.AvgRtt.Milliseconds(), stats.StdDev.Milliseconds(), packetColor, int(math.Round(stats.PacketLoss))) fmt.Printf("%s\uE4E2 %d \uE43C %dms %s\uF1B2 %d%%\n", rttColor, stats.AvgRtt.Milliseconds(),
stats.StdDev.Milliseconds(), packetColor, int(math.Round(stats.PacketLoss)))
} }
func formatLineWaybar(stats *PingStats) { func formatLineWaybar(stats *PingStats) {
res := new(WaybarOut) res := new(WaybarOut)
res.Text = fmt.Sprintf("\uE4E2 %d \uE43C %dms \uF1B2 %d%%", stats.AvgRtt.Milliseconds(), stats.StdDev.Milliseconds(), int(math.Round(stats.PacketLoss))) res.Text = fmt.Sprintf("\uE4E2 %d \uE43C %dms \uF1B2 %d%%", stats.AvgRtt.Milliseconds(),
stats.StdDev.Milliseconds(), int(math.Round(stats.PacketLoss)))
res.Class = "good" res.Class = "good"
switch { switch {
@@ -143,7 +145,12 @@ func main() {
tr := 0 tr := 0
lr := time.Now().UTC() lr := time.Now().UTC()
pinger, err := probing.NewPinger(*Host) var pinger *probing.Pinger
var err error
for pinger, err = probing.NewPinger(*Host); err != nil; {
time.Sleep(2 * time.Second)
}
pinger.RecordRtts = false pinger.RecordRtts = false
pinger.OnRecv = func(pkt *probing.Packet) { pinger.OnRecv = func(pkt *probing.Packet) {
@@ -152,11 +159,12 @@ func main() {
lr = time.Now().UTC() lr = time.Now().UTC()
ts = pinger.PacketsSent ts = pinger.PacketsSent
tr = pinger.PacketsRecv tr = pinger.PacketsRecv
if err != nil { switch {
case err != nil:
fmt.Println(err) fmt.Println(err)
} else if *Waybar { case *Waybar:
formatLineWaybar(pStats) formatLineWaybar(pStats)
} else { default:
formatLinePolybar(pStats) formatLinePolybar(pStats)
} }
} }
@@ -167,11 +175,12 @@ func main() {
pStats, err := lp.Stats(pinger.PacketsSent-ts, pinger.PacketsRecv-tr) pStats, err := lp.Stats(pinger.PacketsSent-ts, pinger.PacketsRecv-tr)
ts = pinger.PacketsSent ts = pinger.PacketsSent
tr = pinger.PacketsRecv tr = pinger.PacketsRecv
if err != nil { switch {
case err != nil:
fmt.Println(err) fmt.Println(err)
} else if *Waybar { case *Waybar:
formatLineWaybar(pStats) formatLineWaybar(pStats)
} else { default:
formatLinePolybar(pStats) formatLinePolybar(pStats)
} }
} }
@@ -188,12 +197,8 @@ func main() {
} }
}() }()
killLoop: for range killSignals {
for { break
select {
case <-killSignals:
break killLoop
}
} }
pinger.Stop() pinger.Stop()
} }