Skip to content

Commit bd41de4

Browse files
committed
refactor(picod): use local variable for http.Server in Run
Signed-off-by: Abhinav Singh <abhinavsingh717073@gmail.com>
1 parent 05b11ac commit bd41de4

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

pkg/picod/server.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ type Config struct {
3636
// Server defines the PicoD HTTP server
3737
type Server struct {
3838
engine *gin.Engine
39-
httpServer *http.Server
4039
config Config
4140
authManager *AuthManager
4241
startTime time.Time
@@ -102,7 +101,7 @@ func (s *Server) Run(ctx context.Context) error {
102101
addr := fmt.Sprintf(":%d", s.config.Port)
103102
klog.Infof("PicoD server starting on %s", addr)
104103

105-
s.httpServer = &http.Server{
104+
server := &http.Server{
106105
Addr: addr,
107106
Handler: s.engine,
108107
ReadHeaderTimeout: 10 * time.Second, // Prevent Slowloris attacks
@@ -114,13 +113,13 @@ func (s *Server) Run(ctx context.Context) error {
114113
// Allow enough time for in-flight commands to finish (default timeout is 60s).
115114
shutdownCtx, cancel := context.WithTimeout(context.Background(), 90*time.Second)
116115
defer cancel()
117-
if err := s.httpServer.Shutdown(shutdownCtx); err != nil {
116+
if err := server.Shutdown(shutdownCtx); err != nil {
118117
klog.Errorf("HTTP server shutdown error: %v", err)
119118
}
120119
close(idleConnsClosed)
121120
}()
122121

123-
if err := s.httpServer.ListenAndServe(); err != http.ErrServerClosed {
122+
if err := server.ListenAndServe(); err != http.ErrServerClosed {
124123
return err
125124
}
126125

0 commit comments

Comments
 (0)