Malin/ZPLify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error handling

Browse Source
This commit is contained in:
Simon Waldherr
2019-04-28 16:35:16 +02:00
parent 58df6c5299
commit 3b69ac96d5
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/zplgfa/main.go
View File

@@ -21,36 +21,39 @@ import (
func specialCmds(zebraCmdFlag, networkIpFlag, networkPortFlag string) bool { func specialCmds(zebraCmdFlag, networkIpFlag, networkPortFlag string) bool {
var cmdSent bool var cmdSent bool
if strings.Contains(zebraCmdFlag, "cancel") && networkIpFlag != "" { if networkIpFlag == "" {
return cmdSent
}
if strings.Contains(zebraCmdFlag, "cancel") {
if err := sendCancelCmdToZebra(networkIpFlag, networkPortFlag); err == nil { if err := sendCancelCmdToZebra(networkIpFlag, networkPortFlag); err == nil {
cmdSent = true cmdSent = true
} }
} }
if strings.Contains(zebraCmdFlag, "calib") && networkIpFlag != "" { if strings.Contains(zebraCmdFlag, "calib") {
if err := sendCalibCmdToZebra(networkIpFlag, networkPortFlag); err == nil { if err := sendCalibCmdToZebra(networkIpFlag, networkPortFlag); err == nil {
cmdSent = true cmdSent = true
} }
} }
if strings.Contains(zebraCmdFlag, "feed") && networkIpFlag != "" { if strings.Contains(zebraCmdFlag, "feed") {
if err := sendFeedCmdToZebra(networkIpFlag, networkPortFlag); err == nil { if err := sendFeedCmdToZebra(networkIpFlag, networkPortFlag); err == nil {
cmdSent = true cmdSent = true
} }
} }
if strings.Contains(zebraCmdFlag, "info") && networkIpFlag != "" { if strings.Contains(zebraCmdFlag, "info") {
info, err := getInfoFromZebra(networkIpFlag, networkPortFlag) info, err := getInfoFromZebra(networkIpFlag, networkPortFlag)
if err == nil { if err == nil {
fmt.Println(info) fmt.Println(info)
cmdSent = true cmdSent = true
} }
} }
if strings.Contains(zebraCmdFlag, "config") && networkIpFlag != "" { if strings.Contains(zebraCmdFlag, "config") {
info, err := getConfigFromZebra(networkIpFlag, networkPortFlag) info, err := getConfigFromZebra(networkIpFlag, networkPortFlag)
if err == nil { if err == nil {
fmt.Println(info) fmt.Println(info)
cmdSent = true cmdSent = true
} }
} }
if strings.Contains(zebraCmdFlag, "diag") && networkIpFlag != "" { if strings.Contains(zebraCmdFlag, "diag") {
info, err := getDiagFromZebra(networkIpFlag, networkPortFlag) info, err := getDiagFromZebra(networkIpFlag, networkPortFlag)
if err == nil { if err == nil {
fmt.Println(info) fmt.Println(info)

9
cmd/zplgfa/network.go
View File

@@ -9,6 +9,9 @@ import (
func sendDataToZebra(ip, port, str string) error { func sendDataToZebra(ip, port, str string) error {
tcpAddr, err := net.ResolveTCPAddr("tcp", ip+":"+port) tcpAddr, err := net.ResolveTCPAddr("tcp", ip+":"+port)
if err != nil {
return err
}
conn, err := net.DialTCP("tcp4", nil, tcpAddr) conn, err := net.DialTCP("tcp4", nil, tcpAddr)
if err == nil { if err == nil {
defer conn.Close() defer conn.Close()
@@ -34,6 +37,9 @@ func sendCancelCmdToZebra(ip, port string) error {
func getInfoFromZebra(ip, port string) (string, error) { func getInfoFromZebra(ip, port string) (string, error) {
tcpAddr, err := net.ResolveTCPAddr("tcp", ip+":"+port) tcpAddr, err := net.ResolveTCPAddr("tcp", ip+":"+port)
if err != nil {
return "", err
}
conn, err := net.DialTCP("tcp4", nil, tcpAddr) conn, err := net.DialTCP("tcp4", nil, tcpAddr)
if err == nil { if err == nil {
defer conn.Close() defer conn.Close()
@@ -70,6 +76,9 @@ func getTerminalOutputFromZebra(ip, port, cmd string) (string, error) {
var config string var config string
var lastInput time.Time var lastInput time.Time
tcpAddr, err := net.ResolveTCPAddr("tcp", ip+":"+port) tcpAddr, err := net.ResolveTCPAddr("tcp", ip+":"+port)
if err != nil {
return "", err
}
conn, err := net.DialTCP("tcp4", nil, tcpAddr) conn, err := net.DialTCP("tcp4", nil, tcpAddr)
if err == nil { if err == nil {
defer conn.Close() defer conn.Close()