Skip to content

Commit

Permalink
mod init error hadnler debug tbrandon#2
Browse files Browse the repository at this point in the history
  • Loading branch information
ecoshub committed Feb 17, 2021
1 parent 3d4fc9d commit 1b93c0a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
8 changes: 8 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module mbserver

go 1.15

require (
github.com/goburrow/modbus v0.1.0
github.com/goburrow/serial v0.1.0
)
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
github.com/goburrow/modbus v0.1.0 h1:DejRZY73nEM6+bt5JSP6IsFolJ9dVcqxsYbpLbeW/ro=
github.com/goburrow/modbus v0.1.0/go.mod h1:Kx552D5rLIS8E7TyUwQ/UdHEqvX5T8tyiGBTlzMcZBg=
github.com/goburrow/serial v0.1.0 h1:v2T1SQa/dlUqQiYIT8+Cu7YolfqAi3K96UmhwYyuSrA=
github.com/goburrow/serial v0.1.0/go.mod h1:sAiqG0nRVswsm1C97xsttiYCzSLBmUZ/VSlVLZJ8haA=
12 changes: 6 additions & 6 deletions servertu.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ func (s *Server) acceptSerialRequests(port serial.Port, slaveID uint8) {
bytesRead, err := port.Read(buffer)
if err != nil {
if err != io.EOF {
if s.errorHandler != nil {
(*s.errorHandler)(fmt.Errorf("[mbserver] serial read error %v", err))
if s.onErrorhandler != nil {
(*s.onErrorhandler)(fmt.Errorf("[mbserver] serial read error %v", err))
}
}
return
Expand All @@ -41,17 +41,17 @@ func (s *Server) acceptSerialRequests(port serial.Port, slaveID uint8) {

frame, err := NewRTUFrame(packet)
if err != nil {
if s.errorHandler != nil {
(*s.errorHandler)(fmt.Errorf("[mbserver] serial read error %v", err))
if s.onErrorhandler != nil {
(*s.onErrorhandler)(fmt.Errorf("[mbserver] serial read error %v", err))
}
return
}
if frame.GetAddress() == slaveID {
request := &Request{port, frame}
s.requestChan <- request
} else {
if s.errorHandler != nil {
(*s.errorHandler)(fmt.Errorf("[mbserver] serial read error %v", err))
if s.onErrorhandler != nil {
(*s.onErrorhandler)(fmt.Errorf("[mbserver] serial read error %v", err))
}
}

Expand Down
8 changes: 4 additions & 4 deletions servetcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ func (s *Server) accept(listen net.Listener) error {
bytesRead, err := conn.Read(packet)
if err != nil {
if err != io.EOF {
if s.errorHandler != nil {
(*s.errorHandler)(fmt.Errorf("[mbserver] read error %v", err))
if s.onErrorhandler != nil {
(*s.onErrorhandler)(fmt.Errorf("[mbserver] read error %v", err))
}
}
return
Expand All @@ -35,8 +35,8 @@ func (s *Server) accept(listen net.Listener) error {

frame, err := NewTCPFrame(packet)
if err != nil {
if s.errorHandler != nil {
(*s.errorHandler)(fmt.Errorf("[mbserver] bad packet error %v", err))
if s.onErrorhandler != nil {
(*s.onErrorhandler)(fmt.Errorf("[mbserver] bad packet error %v", err))
}
return
}
Expand Down

0 comments on commit 1b93c0a

Please sign in to comment.