From 109393dd168ca7af74df312af86ac033e26e5c96 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Mon, 23 Mar 2026 01:35:09 +0800 Subject: [PATCH] fix(server): reduce kill delay and implement port retry mechanism - Changed the kill delay from 30 seconds to 2 seconds in the configuration. - Refactored the server startup process to include a retry mechanism for binding to the port, addressing potential issues during hot-reload scenarios. - Added a new function, listenWithRetry, to handle port binding with exponential backoff, improving server reliability during restarts. --- .air.toml | 2 +- cmd/server/main.go | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.air.toml b/.air.toml index 6b51df6f..cf394665 100644 --- a/.air.toml +++ b/.air.toml @@ -17,7 +17,7 @@ tmp_dir = "tmp" include_dir = [] include_ext = ["go", "tpl", "tmpl", "html", "yaml"] include_file = [] - kill_delay = "30s" + kill_delay = "2s" log = "build-errors.log" poll = false poll_interval = 0 diff --git a/cmd/server/main.go b/cmd/server/main.go index 9ce82fc4..03435d7d 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -25,6 +25,7 @@ package main import ( "context" "fmt" + "net" "net/http" "os" "os/signal" @@ -61,7 +62,6 @@ func main() { ) error { // Create HTTP server server := &http.Server{ - Addr: fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port), Handler: router, } @@ -94,11 +94,16 @@ func main() { done() }() - // Start server - logger.Infof(context.Background(), "Server is running at %s:%d", cfg.Server.Host, cfg.Server.Port) - if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed { + // Start server with retry to handle port not yet released during hot-reload + addr := fmt.Sprintf("%s:%d", cfg.Server.Host, cfg.Server.Port) + listener, err := listenWithRetry(addr, 10, 300*time.Millisecond) + if err != nil { return fmt.Errorf("failed to start server: %v", err) } + logger.Infof(context.Background(), "Server is running at %s", addr) + if err := server.Serve(listener); err != nil && err != http.ErrServerClosed { + return fmt.Errorf("server error: %v", err) + } // Wait for shutdown signal <-ctx.Done() @@ -108,3 +113,25 @@ func main() { logger.Fatalf(context.Background(), "Failed to run application: %v", err) } } + +// listenWithRetry retries net.Listen with exponential backoff, +// useful during hot-reload when the previous process may not have released the port yet. +func listenWithRetry(addr string, maxRetries int, baseDelay time.Duration) (net.Listener, error) { + var lastErr error + for i := 0; i < maxRetries; i++ { + listener, err := net.Listen("tcp", addr) + if err == nil { + return listener, nil + } + lastErr = err + if i < maxRetries-1 { + delay := baseDelay * time.Duration(1< 3*time.Second { + delay = 3 * time.Second + } + logger.Warnf(context.Background(), "Port %s in use, retrying in %v... (%d/%d)", addr, delay, i+1, maxRetries) + time.Sleep(delay) + } + } + return nil, lastErr +}