apply task package

cmd/serve.go

@@ -14,6 +14,8 @@ import (
 	"time"
 
 	"git.ronmi.tw/ronmi/forgejo-pages/lib"
+	"github.com/raohwork/task"
+	"github.com/raohwork/task/httptask"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -70,14 +72,7 @@ cache/protection layer like Cloudflare in front of the server.
 		defer stop()
 
 		fmt.Println("starting server")
-		go func() {
-			<-ctx.Done()
-			stop()
-			ctx, cancel := context.WithTimeout(context.TODO(), 5*time.Second)
-			defer cancel()
-			s.Shutdown(ctx)
-		}()
-		s.ListenAndServe()
+		httptask.Server(s, task.Timeout(10*time.Second)).Run(ctx)
 	},
 }