Merge pull request #10 from goinsane/develop

v1.2.3

Author: orkunkaraduman

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019, go-accepter authors.
+Copyright (c) 2019, accepter authors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -8,7 +8,7 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of the go-accepter authors nor the
+    * Neither the name of the accepter authors nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 

README.md

@@ -1,6 +1,6 @@
 # accepter
 
-[![GoDoc](https://godoc.org/github.com/orkunkaraduman/go-accepter?status.svg)](https://godoc.org/github.com/orkunkaraduman/go-accepter)
+[![GoDoc](https://godoc.org/github.com/goinsane/accepter?status.svg)](https://godoc.org/github.com/goinsane/accepter)
 
 Package accepter provides an Accepter and utilities for net.Listener.
 It is similar with GoLang's http.Server.
@@ -11,6 +11,6 @@ It is similar with GoLang's http.Server.
 * changed Handler.Serve arguments to (ctx, conn) from (conn, closeCh)
 * removed panic recovering for Handler.Serve(...)
 * removed Accepter.ErrorLog
-* removed TCPListenAndServe and TCPListenAndServeTLS
-* added ListenAndServe and ListenAndServeTLS
+* added ListenAndServe and ListenAndServeTLS instead of TCPListenAndServe and TCPListenAndServeTLS
 * added go.mod support
+* added SetMaxTempDelay(...)

accepter.go

@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"net"
 	"sync"
+	"sync/atomic"
 	"time"
 )
 
@@ -27,6 +28,16 @@ type Accepter struct {
 	connsMu      sync.RWMutex
 }
 
+var (
+	maxTempDelay time.Duration
+)
+
+// SetMaxTempDelay sets maximum temporary error wait duration as concurrent-safe.
+// Zero or negative values mean to wait forever. By default, zero.
+func SetMaxTempDelay(d time.Duration) {
+	atomic.StoreInt64((*int64)(&maxTempDelay), int64(d))
+}
+
 // Shutdown gracefully shuts down the Accepter without interrupting any
 // connections. Shutdown works by first closing the Accepter's underlying Listener, then
 // cancels the context on Serve method of Handler, and then waiting indefinitely for
@@ -127,7 +138,7 @@ func (a *Accepter) Serve(lis net.Listener) (err error) {
 	a.ctx, a.ctxCancel = context.WithCancel(context.Background())
 	defer a.ctxCancel()
 	a.conns = make(map[net.Conn]struct{})
-	var tempDelay time.Duration
+	var tempDelay, totalDelay time.Duration
 	for {
 		var conn net.Conn
 		conn, err = lis.Accept()
@@ -139,6 +150,10 @@ func (a *Accepter) Serve(lis net.Listener) (err error) {
 			default:
 			}
 			if ne, ok := err.(net.Error); ok && ne.Temporary() {
+				maxDelay := time.Duration(atomic.LoadInt64((*int64)(&maxTempDelay)))
+				if maxDelay > 0 && totalDelay > maxDelay {
+					return
+				}
 				if tempDelay == 0 {
 					tempDelay = 5 * time.Millisecond
 				} else {
@@ -148,11 +163,13 @@ func (a *Accepter) Serve(lis net.Listener) (err error) {
 					tempDelay = max
 				}
 				time.Sleep(tempDelay)
+				totalDelay += tempDelay
 				continue
 			}
 			return
 		}
 		tempDelay = 0
+		totalDelay = 0
 		go a.serve(conn)
 	}
 }

examples/echo/main.go

@@ -7,7 +7,7 @@ import (
 	"log"
 	"net"
 
-	accepter "github.com/orkunkaraduman/go-accepter"
+	"github.com/goinsane/accepter"
 )
 
 func main() {

go.mod

@@ -1,3 +1,3 @@
-module github.com/orkunkaraduman/go-accepter
+module github.com/goinsane/accepter
 
 go 1.1