91fa5d6ab4
本次提交包含： - B-01: HTTP Server 添加超时配置 (ReadTimeout/WriteTimeout/IdleTimeout/MaxHeaderBytes) - 添加结构化日志包 internal/log/ (B-02 部分完成) - 添加 Review 报告文档 - 添加系统性修复方案文档 - 添加最佳实践审核报告文档 - 更新任务清单和执行板 测试验证： - TestServerHasTimeoutConfiguration 通过 关联文档： - docs/2026-06-01-SYSTEMATIC-REVIEW-REPORT.md - docs/2026-06-01-SYSTEMATIC-REPAIR-PLAN.md - docs/2026-06-01-BEST-PRACTICE-AUDIT-REPORT.md
74 lines
1.5 KiB
Go
74 lines
1.5 KiB
Go
package app
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net"
|
|
"net/http"
|
|
"time"
|
|
)
|
|
|
|
type ListenerFactory func(network, address string) (net.Listener, error)
|
|
|
|
type Server struct {
|
|
server *http.Server
|
|
listen ListenerFactory
|
|
}
|
|
|
|
func NewServer(listenAddr string, handler http.Handler, listenerFactory ListenerFactory) *Server {
|
|
if handler == nil {
|
|
handler = NewAPIHandler("", ActionSet{})
|
|
}
|
|
server := &Server{
|
|
server: &http.Server{
|
|
Addr: listenAddr,
|
|
Handler: handler,
|
|
ReadTimeout: 30 * time.Second,
|
|
ReadHeaderTimeout: 10 * time.Second,
|
|
WriteTimeout: 30 * time.Second,
|
|
IdleTimeout: 120 * time.Second,
|
|
MaxHeaderBytes: 1 << 20, // 1MB
|
|
},
|
|
listen: net.Listen,
|
|
}
|
|
if listenerFactory != nil {
|
|
server.listen = listenerFactory
|
|
}
|
|
return server
|
|
}
|
|
|
|
func (s *Server) Addr() string {
|
|
return s.server.Addr
|
|
}
|
|
|
|
func (s *Server) Run(ctx context.Context) error {
|
|
listener, err := s.listen("tcp", s.server.Addr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return s.Serve(ctx, listener)
|
|
}
|
|
|
|
func (s *Server) Serve(ctx context.Context, listener net.Listener) error {
|
|
errCh := make(chan error, 1)
|
|
go func() {
|
|
err := s.server.Serve(listener)
|
|
if errors.Is(err, http.ErrServerClosed) {
|
|
err = nil
|
|
}
|
|
errCh <- err
|
|
}()
|
|
|
|
select {
|
|
case <-ctx.Done():
|
|
shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
|
defer cancel()
|
|
if err := s.server.Shutdown(shutdownCtx); err != nil {
|
|
return err
|
|
}
|
|
return <-errCh
|
|
case err := <-errCh:
|
|
return err
|
|
}
|
|
}
|