signald/signald-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve error handling for listen

Browse source
This commit is contained in:
finn 2022-12-29 17:45:22 -08:00
parent 097e95bdb1
commit d983bfb9a3
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
signald/signald.go
View file

@ -104,7 +104,7 @@ func (s *Signald) Close() error {
} }
// Listen listens for events from signald // Listen listens for events from signald
func (s *Signald) Listen(c chan client_protocol.BasicResponse) { func (s *Signald) Listen(c chan client_protocol.BasicResponse) error {
for { for {
msg, err := s.readNext() msg, err := s.readNext()
if err == io.EOF { if err == io.EOF {
@ -112,7 +112,11 @@ func (s *Signald) Listen(c chan client_protocol.BasicResponse) {
if c != nil { if c != nil {
close(c) close(c)
} }
return return nil
}
if err != nil {
return err
} }
if msg.Type == "unexpected_error" { if msg.Type == "unexpected_error" {
@ -174,9 +178,6 @@ func (s *Signald) readNext() (b client_protocol.BasicResponse, err error) {
} else { } else {
err = json.NewDecoder(s.socket).Decode(&b) err = json.NewDecoder(s.socket).Decode(&b)
} }
if err != nil {
log.Println("signald-go: error decoding message from signald:", err)
return
}
return return
} }