docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container 

daemon: cleanup getting container logic
This commit is contained in:
Alexander Morozov 2015-06-09 10:42:24 -07:00
parent 90259fed2e 73bc885b23
commit 06aef2b5c2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon/daemon.go
View File

@ -128,19 +128,16 @@ func (daemon *Daemon) Get(prefixOrName string) (*Container, error) {
} }
// GetByName will match only an exact name provided; we ignore errors // GetByName will match only an exact name provided; we ignore errors
containerByName, _ := daemon.GetByName(prefixOrName) if containerByName, _ := daemon.GetByName(prefixOrName); containerByName != nil {
containerId, indexError := daemon.idIndex.Get(prefixOrName)
if containerByName != nil {
// prefix is an exact match to a full container Name // prefix is an exact match to a full container Name
return containerByName, nil return containerByName, nil
} }
if containerId != "" { containerId, indexError := daemon.idIndex.Get(prefixOrName)
// prefix is a fuzzy match to a container ID if indexError != nil {
return daemon.containers.Get(containerId), nil return nil, indexError
} }
return nil, indexError return daemon.containers.Get(containerId), nil
} }
// Exists returns a true if a container of the specified ID or name exists, // Exists returns a true if a container of the specified ID or name exists,