refactor: some code improves

Author: savsgio

atreugo.go

@@ -13,15 +13,15 @@ import (
 
 var (
 	tcpNetworks   = []string{"tcp", "tcp4", "tcp6"}
-	validNetworks = append(tcpNetworks, []string{"unix"}...)
+	validNetworks = append(tcpNetworks, "unix")
 
 	defaultLogger Logger = log.New(os.Stderr, "", log.LstdFlags)
 )
 
 // New create a new instance of Atreugo Server.
 func New(cfg Config) *Atreugo {
 	if cfg.Network != "" && !strings.Include(validNetworks, cfg.Network) {
-		panic("Invalid network: " + cfg.Network)
+		panic("invalid network: " + cfg.Network)
 	}
 
 	if cfg.Network == "" {
@@ -250,7 +250,7 @@ func (s *Atreugo) Serve(ln net.Listener) error {
 // If you pass multiples hostnames, all of them will have the same behaviour.
 func (s *Atreugo) NewVirtualHost(hostnames ...string) *Router {
 	if len(hostnames) == 0 {
-		panic("At least 1 hostname is required")
+		panic("at least 1 hostname is required")
 	}
 
 	if s.virtualHosts == nil {
@@ -264,7 +264,7 @@ func (s *Atreugo) NewVirtualHost(hostnames ...string) *Router {
 
 	for _, name := range hostnames {
 		if s.virtualHosts[name] != nil {
-			panicf("a router is already registered for virtual host '%s'", name)
+			panicf("a router is already registered for virtual host: %s", name)
 		}
 
 		s.virtualHosts[name] = vHost.router.Handler

atreugo_test.go

@@ -562,15 +562,15 @@ func TestAtreugo_NewVirtualHost(t *testing.T) { //nolint:funlen
 	conflictHosts := []conflictArgs{
 		{
 			hostnames:  []string{hostname},
-			wantErrMsg: fmt.Sprintf("a router is already registered for virtual host '%s'", hostname),
+			wantErrMsg: fmt.Sprintf("a router is already registered for virtual host: %s", hostname),
 		},
 		{
 			hostnames:  []string{},
-			wantErrMsg: "At least 1 hostname is required",
+			wantErrMsg: "at least 1 hostname is required",
 		},
 		{
 			hostnames:  []string{"localhost", "localhost"},
-			wantErrMsg: fmt.Sprintf("a router is already registered for virtual host '%s'", hostname),
+			wantErrMsg: fmt.Sprintf("a router is already registered for virtual host: %s", hostname),
 		},
 	}
 

atreugo_unix.go

@@ -12,8 +12,6 @@ import (
 // ServeGracefully serves incoming connections from the given listener with graceful shutdown
 //
 // It's blocked until the given listener returns permanent error.
-//
-// WARNING: Windows is not supportted.
 func (s *Atreugo) ServeGracefully(ln net.Listener) error {
 	s.cfg.GracefulShutdown = true
 

context.go

@@ -12,13 +12,15 @@ import (
 	"github.com/valyala/fasthttp"
 )
 
-var attachedCtxKey = fmt.Sprintf("__attachedCtx::%s__", bytes.Rand(make([]byte, 15)))
+var (
+	attachedCtxKey = fmt.Sprintf("__attachedCtx::%s__", bytes.Rand(make([]byte, 15)))
 
-var requestCtxPool = &sync.Pool{
-	New: func() interface{} {
-		return new(RequestCtx)
-	},
-}
+	requestCtxPool = sync.Pool{
+		New: func() interface{} {
+			return new(RequestCtx)
+		},
+	}
+)
 
 // AcquireRequestCtx returns an empty RequestCtx instance from request context pool.
 //
@@ -110,19 +112,16 @@ func (ctx *RequestCtx) MatchedRoutePath() []byte {
 //
 // instead of:
 //
-//	ctx.AttachContext(context.WithValue(context.Background(), "myKey", "myValue"))
+//	ctx.AttachContext(context.WithValue(myCtx, "myKey", "myValue"))
 //	ctx.Value("myKey")
 //
 // to avoid extra allocation.
 func (ctx *RequestCtx) Value(key interface{}) interface{} {
 	if atomic.CompareAndSwapInt32(&ctx.searchingOnAttachedCtx, 0, 1) {
 		defer atomic.StoreInt32(&ctx.searchingOnAttachedCtx, 0)
 
-		extraCtx := ctx.AttachedContext()
-		if extraCtx != nil {
-			val := extraCtx.Value(key)
-
-			return val
+		if extraCtx := ctx.AttachedContext(); extraCtx != nil {
+			return extraCtx.Value(key)
 		}
 	}
 

listener_unix.go

@@ -17,7 +17,7 @@ func (s *Atreugo) getListener() (net.Listener, error) {
 
 	if s.cfg.Network == "unix" {
 		if err := os.Remove(s.cfg.Addr); err != nil && !os.IsNotExist(err) {
-			return nil, wrapErrorf(err, "unexpected error when trying to remove unix socket file %q", s.cfg.Addr)
+			return nil, wrapErrorf(err, "unexpected error when trying to remove unix socket file: %q", s.cfg.Addr)
 		}
 	}
 
@@ -28,7 +28,7 @@ func (s *Atreugo) getListener() (net.Listener, error) {
 
 	if s.cfg.Network == "unix" {
 		if err := s.cfg.chmodUnixSocketFunc(s.cfg.Addr); err != nil {
-			return nil, err
+			return nil, wrapError(err, "failed to chmod unix socket file")
 		}
 	}
 

router.go

@@ -387,7 +387,7 @@ func (r *Router) ServeFile(url, filePath string) *Path {
 // communication with a proxy).
 func (r *Router) Path(method, url string, viewFn View) *Path {
 	if method != strings.ToUpper(method) {
-		panic("The http method '" + method + "' must be in uppercase")
+		panicf("http method '%s' must be in uppercase", method)
 	}
 
 	p := &Path{