server: return 'terminated' error when server is terminated with Close()

This commit is contained in:
aler9
2021-10-30 13:30:07 +02:00
parent 653b3ee993
commit 3bb5c2f12c

View File

@@ -343,12 +343,11 @@ func (s *Server) run() {
}
}()
outer:
s.exitError = func() error {
for {
select {
case err := <-acceptErr:
s.exitError = err
break outer
return err
case nconn := <-connNew:
sc := newServerConn(s, nconn)
@@ -435,9 +434,10 @@ outer:
req.res <- ip
case <-s.ctx.Done():
break outer
return liberrors.ErrServerTerminated{}
}
}
}()
s.ctxCancel()