toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace aliased imports of logrus, fixes #11762

Browse Source 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
This commit is contained in:
Antonio Murdaca
2015-03-26 23:22:04 +01:00
parent 90483774e2
commit e5b36a723c
82 changed files with 597 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/utils/http.go
View File

@ -5,7 +5,7 @@ import (
"net/http"
"strings"
log "github.com/Sirupsen/logrus"
"github.com/Sirupsen/logrus"
)
// VersionInfo is used to model entities which has a version.
@ -163,6 +163,6 @@ func (h *HTTPRequestFactory) NewRequest(method, urlStr string, body io.Reader, d
return nil, err
}
}
log.Debugf("%v -- HEADERS: %v", req.URL, req.Header)
logrus.Debugf("%v -- HEADERS: %v", req.URL, req.Header)
return req, err
}

4
components/engine/utils/utils.go
View File

@ -18,7 +18,7 @@ import (
"strings"
"sync"
log "github.com/Sirupsen/logrus"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/fileutils"
@ -157,7 +157,7 @@ func DockerInitPath(localCopy string) string {
func GetTotalUsedFds() int {
if fds, err := ioutil.ReadDir(fmt.Sprintf("/proc/%d/fd", os.Getpid())); err != nil {
log.Errorf("Error opening /proc/%d/fd: %s", os.Getpid(), err)
logrus.Errorf("Error opening /proc/%d/fd: %s", os.Getpid(), err)
} else {
return len(fds)
}