Skip to content

Commit eb34220

Browse files
committed
Factored exit function
1 parent d3577b5 commit eb34220

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

client.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,18 @@ func (disc *Client) jsonDecodeLoop(in io.Reader, outChan chan<- *discoveryMessag
127127
disc.incomingMessagesError = err
128128
disc.statusMutex.Unlock()
129129
close(outChan)
130-
disc.logger.Errorf("stopped discovery %s decode loop: %v", disc, err)
130+
if err != nil {
131+
disc.logger.Errorf("stopped discovery %s decode loop: %v", disc, err)
132+
} else {
133+
disc.logger.Infof("stopped discovery %s decode loop", disc, err)
134+
}
131135
}
132136

133137
for {
134138
var msg discoveryMessage
135139
if err := decoder.Decode(&msg); errors.Is(err, io.EOF) {
136-
// This is fine, we exit gracefully
137-
disc.statusMutex.Lock()
138-
disc.incomingMessagesError = err
139-
disc.statusMutex.Unlock()
140-
close(outChan)
140+
// This is fine :flames: we exit gracefully
141+
closeAndReportError(nil)
141142
return
142143
} else if err != nil {
143144
closeAndReportError(err)

0 commit comments

Comments
 (0)