clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16497 from MHBauer/attach-refactor-new

Browse Source 
refactor attach to not use internal data structures
This commit is contained in:
Jess Frazelle
2015-09-23 16:52:39 -07:00
parent d71ae45772 8aef1a33eb
commit ddd0c47412
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/container.go
+8 -8
View File
@@ -444,10 +444,10 @@ func (s *Server) postContainersAttach(ctx context.Context, w http.ResponseWriter
if vars == nil {
return fmt.Errorf("Missing parameter")
}
containerName := vars["name"]
cont, err := s.daemon.Get(vars["name"])
if err != nil {
return err
if !s.daemon.Exists(containerName) {
return derr.ErrorCodeNoSuchContainer.WithArgs(containerName)
}
inStream, outStream, err := hijackServer(w)
@@ -472,7 +472,7 @@ func (s *Server) postContainersAttach(ctx context.Context, w http.ResponseWriter
Stream: boolValue(r, "stream"),
}
if err := s.daemon.ContainerAttachWithLogs(cont, attachWithLogsConfig); err != nil {
if err := s.daemon.ContainerAttachWithLogs(containerName, attachWithLogsConfig); err != nil {
fmt.Fprintf(outStream, "Error attaching: %s\n", err)
}
@@ -486,10 +486,10 @@ func (s *Server) wsContainersAttach(ctx context.Context, w http.ResponseWriter,
if vars == nil {
return fmt.Errorf("Missing parameter")
}
containerName := vars["name"]
cont, err := s.daemon.Get(vars["name"])
if err != nil {
return err
if !s.daemon.Exists(containerName) {
return derr.ErrorCodeNoSuchContainer.WithArgs(containerName)
}
h := websocket.Handler(func(ws *websocket.Conn) {
@@ -503,7 +503,7 @@ func (s *Server) wsContainersAttach(ctx context.Context, w http.ResponseWriter,
Stream: boolValue(r, "stream"),
}
if err := s.daemon.ContainerWsAttachWithLogs(cont, wsAttachWithLogsConfig); err != nil {
if err := s.daemon.ContainerWsAttachWithLogs(containerName, wsAttachWithLogsConfig); err != nil {
logrus.Errorf("Error attaching websocket: %s", err)
}
})