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

Log when truncindex.Get returns >1 container 

When the user is not using the full has to retrieve a container it's
possible that we find conflicts with the ids of other containers.

At the moment it's just failing saying that it can not find a container,
but it doesn't say why. Adding a small log saying that duplicates where
found is going to help the user.

Closes #8098

Signed-off-by: Alex Gonzalez <agonzalezro@gmail.com>
This commit is contained in:
Álex González 2014-11-03 00:25:44 +00:00
parent 8ca28a35c7
commit be27d97118
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/daemon.go
View File

@ -151,12 +151,22 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
// Get looks for a container by the specified ID or name, and returns it. // Get looks for a container by the specified ID or name, and returns it.
// If the container is not found, or if an error occurs, nil is returned. // If the container is not found, or if an error occurs, nil is returned.
func (daemon *Daemon) Get(name string) *Container { func (daemon *Daemon) Get(name string) *Container {
if id, err := daemon.idIndex.Get(name); err == nil { var (
id string
err error
)
if id, err = daemon.idIndex.Get(name); err == nil {
return daemon.containers.Get(id) return daemon.containers.Get(id)
} }
if c, _ := daemon.GetByName(name); c != nil { if c, _ := daemon.GetByName(name); c != nil {
return c return c
} }
if err == truncindex.ErrDuplicateID {
log.Errorf("Short ID %s is ambiguous: please retry with more characters or use the full ID.\n", name)
}
return nil return nil
} }

7
pkg/truncindex/truncindex.go
View File

@ -11,8 +11,9 @@ import (
var ( var (
// ErrNoID is thrown when attempting to use empty prefixes // ErrNoID is thrown when attempting to use empty prefixes
ErrNoID = errors.New("prefix can't be empty") ErrNoID = errors.New("prefix can't be empty")
errDuplicateID = errors.New("multiple IDs were found") // ErrDuplicateID is thrown when a duplicated id was found
ErrDuplicateID = errors.New("multiple IDs were found")
) )
func init() { func init() {
@ -98,7 +99,7 @@ func (idx *TruncIndex) Get(s string) (string, error) {
if id != "" { if id != "" {
// we haven't found the ID if there are two or more IDs // we haven't found the ID if there are two or more IDs
id = "" id = ""
return errDuplicateID return ErrDuplicateID
} }
id = string(prefix) id = string(prefix)
return nil return nil