From f9384878848b73a0b0b8086b780f5beb7a8f3e26 Mon Sep 17 00:00:00 2001
From: loveuer <loveuer@live.com>
Date: Sat, 13 Jan 2024 17:45:44 +0800
Subject: [PATCH] fix: serve listener

---
 app.go              | 11 +++++------
 xtest/basic/main.go |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app.go b/app.go
index 426fc49..b0ce6a0 100644
--- a/app.go
+++ b/app.go
@@ -41,8 +41,11 @@ func (a *App) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 }
 
 func (a *App) run(ln net.Listener) error {
+	srv := &http.Server{Handler: a}
+	a.server = srv
+
 	if !a.config.DisableBanner {
-		fmt.Println(banner + "nf serve at: " + a.server.Addr + "\n")
+		fmt.Println(banner + "nf serve at: " + ln.Addr().String() + "\n")
 	}
 
 	return a.server.Serve(ln)
@@ -54,8 +57,6 @@ func (a *App) Run(address string) error {
 		return err
 	}
 
-	a.server = &http.Server{}
-
 	return a.run(ln)
 }
 
@@ -65,13 +66,11 @@ func (a *App) RunTLS(address string, tlsConfig *tls.Config) error {
 		return err
 	}
 
-	a.server = &http.Server{}
-
 	return a.run(ln)
 }
 
 func (a *App) RunListener(ln net.Listener) error {
-	a.server = &http.Server{}
+	a.server = &http.Server{Addr: ln.Addr().String()}
 
 	return a.run(ln)
 }
diff --git a/xtest/basic/main.go b/xtest/basic/main.go
index 9e45b3a..a7d2b58 100644
--- a/xtest/basic/main.go
+++ b/xtest/basic/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/loveuer/nf"
 	"log"
+	"net"
 )
 
 func main() {
@@ -13,5 +14,6 @@ func main() {
 		return c.JSON(nf.Map{"status": 200, "data": "hello, " + name})
 	})
 
-	log.Fatal(app.Run("0.0.0.0:80"))
+	ln, _ := net.Listen("tcp", ":80")
+	log.Fatal(app.RunListener(ln))
 }