From 5a1605bad5079c266da7be6f787f2e8043e15525 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Sun, 11 Dec 2016 17:46:37 +0100 Subject: [PATCH] server: fix calls to logrus again Signed-off-by: Antonio Murdaca --- server/server.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index 1915e772..b192dab5 100644 --- a/server/server.go +++ b/server/server.go @@ -200,12 +200,12 @@ func (s *Server) reservePodName(id, name string) (string, error) { if err == registrar.ErrNameReserved { id, err := s.podNameIndex.Get(name) if err != nil { - logrus.Warnf("name %s already reserved for %s", name, id) + logrus.Warnf("conflict, pod name %q already reserved", name) return "", err } - return "", fmt.Errorf("conflict, name %s already reserved", name) + return "", fmt.Errorf("conflict, name %q already reserved for pod %q", name, id) } - return "", fmt.Errorf("error reserving name %s", name) + return "", fmt.Errorf("error reserving pod name %q", name) } return name, nil } @@ -219,12 +219,12 @@ func (s *Server) reserveContainerName(id, name string) (string, error) { if err == registrar.ErrNameReserved { id, err := s.ctrNameIndex.Get(name) if err != nil { - logrus.Warnf("get reserved name %s failed", name) + logrus.Warnf("conflict, ctr name %q already reserved", name) return "", err } - return "", fmt.Errorf("conflict, name %s already reserved for %s", name, id) + return "", fmt.Errorf("conflict, name %q already reserved for ctr %q", name, id) } - return "", fmt.Errorf("error reserving name %s", name) + return "", fmt.Errorf("error reserving ctr name %s", name) } return name, nil }