[WIP] Update linter config + speed optimizations
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -11,8 +12,8 @@ import (
|
||||
func (c *MyConfig) UpdateVPNStatus() {
|
||||
var (
|
||||
vpnCStatus string
|
||||
tcpCheck string
|
||||
vpnCheck string
|
||||
b strings.Builder
|
||||
InitialDelay = 100 * time.Millisecond
|
||||
LoopIterationDelay = 3 * time.Second
|
||||
Delay = InitialDelay
|
||||
@@ -27,36 +28,47 @@ func (c *MyConfig) UpdateVPNStatus() {
|
||||
|
||||
if c.VPNFileCheck() {
|
||||
if c.Vpn.UpColor == "" {
|
||||
vpnCheck = `⍋`
|
||||
b.WriteRune('⍋')
|
||||
} else {
|
||||
vpnCheck = fmt.Sprintf(`<span foreground="%s">⍋</span>`, c.Vpn.UpColor)
|
||||
b.WriteString("<span foreground=\"")
|
||||
b.WriteString(c.Vpn.UpColor)
|
||||
b.WriteString("\">⍋</span>")
|
||||
}
|
||||
} else {
|
||||
if c.Vpn.DownColor == "" {
|
||||
vpnCheck = `⍒`
|
||||
b.WriteRune('⍒')
|
||||
} else {
|
||||
vpnCheck = fmt.Sprintf(`<span foreground="%s">⍒</span>`, c.Vpn.DownColor)
|
||||
b.WriteString("<span foreground=\"")
|
||||
b.WriteString(c.Vpn.DownColor)
|
||||
b.WriteString("\">⍒</span>")
|
||||
}
|
||||
}
|
||||
|
||||
vpnCheck = b.String()
|
||||
b.Reset()
|
||||
|
||||
if c.Vpn.TCPCheck.Enabled {
|
||||
if c.VPNTCPCheck() {
|
||||
if c.Vpn.UpColor == "" {
|
||||
tcpCheck = `✔`
|
||||
b.WriteRune('✔')
|
||||
} else {
|
||||
tcpCheck = fmt.Sprintf(`<span foreground="%s">✔</span>`, c.Vpn.UpColor)
|
||||
b.WriteString("<span foreground=\"")
|
||||
b.WriteString(c.Vpn.UpColor)
|
||||
b.WriteString("\">✔</span>")
|
||||
}
|
||||
} else {
|
||||
if c.Vpn.DownColor == "" {
|
||||
tcpCheck = `✘`
|
||||
b.WriteRune('✘')
|
||||
} else {
|
||||
tcpCheck = fmt.Sprintf(`<span foreground="%s">✘</span>`, c.Vpn.DownColor)
|
||||
b.WriteString("<span foreground=\"")
|
||||
b.WriteString(c.Vpn.DownColor)
|
||||
b.WriteString("\">✘</span>")
|
||||
}
|
||||
}
|
||||
|
||||
vpnCStatus = fmt.Sprintf("VPN:%s:%s", vpnCheck, tcpCheck)
|
||||
vpnCStatus = "VPN:" + vpnCheck + ":" + b.String()
|
||||
} else {
|
||||
vpnCStatus = fmt.Sprintf("VPN:%s", vpnCheck)
|
||||
vpnCStatus = "VPN:" + vpnCheck
|
||||
}
|
||||
|
||||
if c.Values.VPNStatus != vpnCStatus {
|
||||
@@ -66,9 +78,9 @@ func (c *MyConfig) UpdateVPNStatus() {
|
||||
}
|
||||
}
|
||||
|
||||
// VPNTCPCheck intended to check arbitrary service inside vpn segment, to indicate that openvpn sevice not stoned.
|
||||
// VPNTCPCheck intended to check arbitrary service inside vpn segment, to indicate that openvpn service not stoned.
|
||||
func (c *MyConfig) VPNTCPCheck() bool {
|
||||
conn, err := net.DialTimeout(
|
||||
conn, err := net.DialTimeout( //nolint: noctx
|
||||
"tcp",
|
||||
fmt.Sprintf("%s:%d", c.Vpn.TCPCheck.Host, c.Vpn.TCPCheck.Port), //nolint: hostport
|
||||
time.Second*time.Duration(c.Vpn.TCPCheck.Timeout),
|
||||
|
||||
Reference in New Issue
Block a user