extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-05-29 22:30:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

job source: do not stop listener on accept() errors

Browse Source 
refs #77
This commit is contained in:
Christian Schwarz 2018-08-25 13:00:51 +02:00
parent d677cde6d0
commit 51cfcfe79b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/config_job_source.go
View File

@ -160,16 +160,11 @@ func (j *SourceJob) serve(ctx context.Context, task *Task) {
connChan := make(chan connChanMsg) connChan := make(chan connChanMsg)
// Serve connections until interrupted or error // Serve connections until interrupted or error
outer: outer:
for { for {
go func() { go func() {
rwc, err := listener.Accept() rwc, err := listener.Accept()
if err != nil {
connChan <- connChanMsg{rwc, err}
close(connChan)
return
}
connChan <- connChanMsg{rwc, err} connChan <- connChanMsg{rwc, err}
}() }()
@ -178,8 +173,8 @@ outer:
case rwcMsg := <-connChan: case rwcMsg := <-connChan:
if rwcMsg.err != nil { if rwcMsg.err != nil {
task.Log().WithError(err).Error("error accepting connection") task.Log().WithError(rwcMsg.err).Error("error accepting connection")
break outer continue
} }
j.handleConnection(rwcMsg.conn, task) j.handleConnection(rwcMsg.conn, task)
@ -187,11 +182,12 @@ outer:
case <-ctx.Done(): case <-ctx.Done():
task.Log().WithError(ctx.Err()).Info("context") task.Log().WithError(ctx.Err()).Info("context")
break outer break outer
} }
} }
task.Log().Info("closing listener")
task.Enter("close_listener") task.Enter("close_listener")
defer task.Finish() defer task.Finish()
err = listener.Close() err = listener.Close()