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

Format error by value

Browse Source 
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
This commit is contained in:
Michal Minar
2015-03-16 12:05:53 +01:00
parent 88924993a2
commit 210ab030bc
14 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/daemon.go
+2 -2
View File
@@ -1015,10 +1015,10 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
log.Errorf("portallocator.ReleaseAll(): %s", err)
}
if err := daemon.driver.Cleanup(); err != nil {
log.Errorf("daemon.driver.Cleanup(): %s", err.Error())
log.Errorf("daemon.driver.Cleanup(): %v", err)
}
if err := daemon.containerGraph.Close(); err != nil {
log.Errorf("daemon.containerGraph.Close(): %s", err.Error())
log.Errorf("daemon.containerGraph.Close(): %v", err)
}
})
daemon/graphdriver/graphtest/graphtest.go
+1 -1
View File
@@ -73,7 +73,7 @@ func newDriver(t *testing.T, name string) *Driver {
d, err := graphdriver.GetDriver(name, root, nil)
if err != nil {
t.Logf("graphdriver: %s\n", err.Error())
t.Logf("graphdriver: %v\n", err)
if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites || err == graphdriver.ErrIncompatibleFS {
t.Skipf("Driver %s not supported", name)
}
daemon/networkdriver/bridge/driver.go
+1 -1
View File
@@ -530,7 +530,7 @@ func Allocate(job *engine.Job) engine.Status {
globalIPv6, err = ipallocator.RequestIP(globalIPv6Network, requestedIPv6)
if err != nil {
log.Errorf("Allocator: RequestIP v6: %s", err.Error())
log.Errorf("Allocator: RequestIP v6: %v", err)
return job.Error(err)
}
log.Infof("Allocated IPv6 %s", globalIPv6)
daemon/networkdriver/portallocator/portallocator.go
+4 -4
View File
@@ -69,11 +69,11 @@ func NewErrPortAlreadyAllocated(ip string, port int) ErrPortAlreadyAllocated {
}
func init() {
const param = "/proc/sys/net/ipv4/ip_local_port_range"
const portRangeKernelParam = "/proc/sys/net/ipv4/ip_local_port_range"
file, err := os.Open(param)
file, err := os.Open(portRangeKernelParam)
if err != nil {
log.Errorf("Failed to read %s kernel parameter: %s", param, err.Error())
log.Errorf("Failed to read %s kernel parameter: %v", portRangeKernelParam, err)
return
}
var start, end int
@@ -82,7 +82,7 @@ func init() {
if err == nil {
err = fmt.Errorf("unexpected count of parsed numbers (%d)", n)
}
log.Errorf("Failed to parse port range from %s: %v", param, err)
log.Errorf("Failed to parse port range from %s: %v", portRangeKernelParam, err)
return
}
beginPortRange = start
daemon/start.go
+1 -1
View File
@@ -66,7 +66,7 @@ func (daemon *Daemon) setHostConfig(container *Container, hostConfig *runconfig.
if err != nil && os.IsNotExist(err) {
err = os.MkdirAll(source, 0755)
if err != nil {
return fmt.Errorf("Could not create local directory '%s' for bind mount: %s!", source, err.Error())
return fmt.Errorf("Could not create local directory '%s' for bind mount: %v!", source, err)
}
}
}
daemon/wait.go
+1 -1
View File
@@ -13,7 +13,7 @@ func (daemon *Daemon) ContainerWait(job *engine.Job) engine.Status {
name := job.Args[0]
container, err := daemon.Get(name)
if err != nil {
return job.Errorf("%s: %s", job.Name, err.Error())
return job.Errorf("%s: %v", job.Name, err)
}
status, _ := container.WaitStop(-1 * time.Second)
job.Printf("%d\n", status)