clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add integration test for unix sock cleanup

Browse Source 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff
2015-03-20 12:34:35 -04:00
parent 0c0e9836c4
commit 16309bef63
5 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/server.go
+5 -2
View File
@@ -1580,10 +1580,13 @@ func ServeApi(job *engine.Job) engine.Status {
}
job.Eng.OnShutdown(func() {
if err := srv.Close(); err != nil {
log.Errorf("%s", err.Error())
log.Error(err)
}
})
chErrors <- srv.Serve()
if err = srv.Serve(); err != nil && strings.Contains(err.Error(), "use of closed network connection") {
err = nil
}
chErrors <- err
}()
}
api/server/server_linux.go
+2 -24
View File
@@ -10,30 +10,8 @@ import (
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/systemd"
"net"
)
type UnixHttpServer struct {
srv *http.Server
l net.Listener
}
func (s *UnixHttpServer) Serve() error {
return s.srv.Serve(s.l)
}
func (s *UnixHttpServer) Close() error {
if err := s.l.Close(); err != nil {
return err
}
if _, err := os.Stat(s.srv.Addr); err != nil {
return fmt.Errorf("Error removing unix socket %s: %s", s.srv.Addr, err.Error())
}
if err := os.Remove(s.srv.Addr); err != nil {
return fmt.Errorf("Error removing unix socket %s: %s", s.srv.Addr, err.Error())
}
return nil
}
// NewServer sets up the required Server and does protocol specific checking.
func NewServer(proto, addr string, job *engine.Job) (Server, error) {
// Basic error and sanity checking
@@ -49,7 +27,7 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) {
}
}
func setupUnixHttp(addr string, job *engine.Job) (*UnixHttpServer, error) {
func setupUnixHttp(addr string, job *engine.Job) (*HttpServer, error) {
r := createRouter(job.Eng, job.GetenvBool("Logging"), job.GetenvBool("EnableCors"), job.Getenv("CorsHeaders"), job.Getenv("Version"))
if err := syscall.Unlink(addr); err != nil && !os.IsNotExist(err) {
@@ -71,7 +49,7 @@ func setupUnixHttp(addr string, job *engine.Job) (*UnixHttpServer, error) {
return nil, err
}
return &UnixHttpServer{&http.Server{Addr: addr, Handler: r}, l}, nil
return &HttpServer{&http.Server{Addr: addr, Handler: r}, l}, nil
}
// serveFd creates an http.Server and sets it up to serve given a socket activated