community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add deadline to the listeners 

Call this deadline to the listener will timeout and we will get to
so if the server should shutdown.
This commit is contained in:
Miek Gieben 2014-08-18 22:14:29 +01:00
parent f3a6c86462
commit 0d300b1fce
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server.go
View File

@ -217,13 +217,13 @@ type Server struct {
// Default buffer size to use to read incoming UDP messages. If not set
// it defaults to MinMsgSize (512 B).
UDPSize int
// The net.Conn.SetReadTimeout value for new connections, defaults to 2 seconds.
// The net.Conn.SetReadTimeout value for new connections, defaults to 2 * time.Second.
ReadTimeout time.Duration
// The net.Conn.SetWriteTimeout value for new connections, defaults to 2 seconds.
// The net.Conn.SetWriteTimeout value for new connections, defaults to 2 * time.Second.
WriteTimeout time.Duration
// TCP idle timeout for multiple queries, if nil, defaults to 8 * time.Second (RFC 5966).
IdleTimeout func() time.Duration
// Listener deadline timeout, defaults to 2 seconds.
// Listener deadline timeout, defaults to 1 * time.Second.
Deadline time.Duration
// Secret(s) for Tsig map[<zonename>]<base64 secret>.
TsigSecret map[string]string
@ -321,7 +321,12 @@ func (srv *Server) serveTCP(l *net.TCPListener) error {
if srv.ReadTimeout != 0 {
rtimeout = srv.ReadTimeout
}
deadline := 1 * time.Second
if srv.Deadline != 0 {
deadline = srv.Deadline
}
for {
l.SetDeadline(time.Now().Add(deadline))
rw, e := l.AcceptTCP()
select {
case <-srv.stopTCP:
@ -355,7 +360,12 @@ func (srv *Server) serveUDP(l *net.UDPConn) error {
if srv.ReadTimeout != 0 {
rtimeout = srv.ReadTimeout
}
deadline := 1 * time.Second
if srv.Deadline != 0 {
deadline = srv.Deadline
}
for {
l.SetDeadline(time.Now().Add(deadline))
m, s, e := srv.readUDP(l, rtimeout)
select {
case <-srv.stopUDP: