bug fix in failover server, only error out if io error

xiegeo · xiegeo · commit adb53db85f5c · 2019-02-01T19:24:49.000-08:00
diff --git a/failover.go b/failover.go
@@ -88,7 +88,7 @@ func (s *FailoverSerialConn) serverRead(b []byte) (int, error) {
 		}
 		n, err := s.PacketReader.Read(b)
 		if err != nil {
-			return n, err
+			return n, err //only real io errors are exposed
 		}
 		s.lock.Lock()
 		locked = true
@@ -115,7 +115,9 @@ func (s *FailoverSerialConn) serverRead(b []byte) (int, error) {
 		pdu, err := rtu.GetPDU()
 		if err != nil {
 			debugf("failover serverRead internal GetPDU error : %v", err)
-			return n, err //bubbles formate up errors
+			s.misses = 0
+			debugf("reset misses\n")
+			continue //throw away and read again
 		}
 		if rtu[0] == 0 {
 			//zero slave id do not have a reply, so we won't expect one

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (s *FailoverSerialConn) serverRead(b []byte) (int, error) {`
`88`	`88`	`}`
`89`	`89`	`n, err := s.PacketReader.Read(b)`
`90`	`90`	`if err != nil {`
`91`		`- return n, err`
	`91`	`+ return n, err //only real io errors are exposed`
`92`	`92`	`}`
`93`	`93`	`s.lock.Lock()`
`94`	`94`	`locked = true`
`@@ -115,7 +115,9 @@ func (s *FailoverSerialConn) serverRead(b []byte) (int, error) {`
`115`	`115`	`pdu, err := rtu.GetPDU()`
`116`	`116`	`if err != nil {`
`117`	`117`	`debugf("failover serverRead internal GetPDU error : %v", err)`
`118`		`- return n, err //bubbles formate up errors`
	`118`	`+ s.misses = 0`
	`119`	`+ debugf("reset misses\n")`
	`120`	`+ continue //throw away and read again`
`119`	`121`	`}`
`120`	`122`	`if rtu[0] == 0 {`
`121`	`123`	`//zero slave id do not have a reply, so we won't expect one`