|
@@ -3,6 +3,7 @@ package apiserver
|
|
|
import (
|
|
|
"context"
|
|
|
"fmt"
|
|
|
+ "io"
|
|
|
"net"
|
|
|
"net/http"
|
|
|
"os"
|
|
@@ -252,11 +253,6 @@ func (s *APIServer) Run() error {
|
|
|
}
|
|
|
}()
|
|
|
<-s.httpServerTomb.Dying()
|
|
|
- log.Infof("run: shutting down api server")
|
|
|
- if err := s.Shutdown(); err != nil {
|
|
|
- log.Errorf("while shutting down API Server : %s", err)
|
|
|
- return err
|
|
|
- }
|
|
|
return nil
|
|
|
})
|
|
|
|
|
@@ -278,5 +274,17 @@ func (s *APIServer) Shutdown() error {
|
|
|
if err := s.httpServer.Shutdown(context.TODO()); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+
|
|
|
+ //close io.writer logger given to gin
|
|
|
+ if pipe, ok := gin.DefaultErrorWriter.(*io.PipeWriter); ok {
|
|
|
+ pipe.Close()
|
|
|
+ }
|
|
|
+ if pipe, ok := gin.DefaultWriter.(*io.PipeWriter); ok {
|
|
|
+ pipe.Close()
|
|
|
+ }
|
|
|
+ s.httpServerTomb.Kill(nil)
|
|
|
+ if err := s.httpServerTomb.Wait(); err != nil {
|
|
|
+ return errors.Wrap(err, "while waiting on httpServerTomb")
|
|
|
+ }
|
|
|
return nil
|
|
|
}
|