From ee5a6f13c13196598021fc963a7be2f86a8a6c5e Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 3 Apr 2013 11:04:33 +0200 Subject: [PATCH 1/6] use fmt.Fprintf instead of fmt.Fprint fmt.Fprint does not allow format strings Upstream-commit: 3b8c2417fbeaf84c4fb35e30f4c1a32ffcb51a59 Component: engine --- components/engine/commands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index 33a0997b9c..43ff0ca24f 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -99,7 +99,7 @@ func (srv *Server) CmdLogin(stdin io.ReadCloser, stdout io.Writer, args ...strin } if err != nil { if err != io.EOF { - fmt.Fprint(stdout, "Read error: %v\n", err) + fmt.Fprintf(stdout, "Read error: %v\n", err) } break } From 2aa92512ac6efa822ca3d9a3238f5dca46fffd47 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 3 Apr 2013 11:08:32 +0200 Subject: [PATCH 2/6] remove dead code in CmdPush Upstream-commit: 5ecd940a594507075e6cee80aa70c258a9d850ca Component: engine --- components/engine/commands.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/commands.go b/components/engine/commands.go index 43ff0ca24f..0475b09451 100644 --- a/components/engine/commands.go +++ b/components/engine/commands.go @@ -512,10 +512,9 @@ func (srv *Server) CmdPush(stdin io.ReadCloser, stdout io.Writer, args ...string return err } return nil - } else { - return err } - return nil + + return err } err = srv.runtime.graph.PushImage(stdout, img, srv.runtime.authConfig) if err != nil { From f1a2914b2e9b806c85b56504f9f7e5a7acde0f4f Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 3 Apr 2013 11:10:50 +0200 Subject: [PATCH 3/6] kill the right containers in runtime_test Upstream-commit: 1fc55c2bb9bce1451d6199e8aaa23ef8baa0e46c Component: engine --- components/engine/runtime_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/runtime_test.go b/components/engine/runtime_test.go index d8e160fc0e..6551c24dc4 100644 --- a/components/engine/runtime_test.go +++ b/components/engine/runtime_test.go @@ -21,10 +21,10 @@ func nuke(runtime *Runtime) error { var wg sync.WaitGroup for _, container := range runtime.List() { wg.Add(1) - go func() { - container.Kill() + go func(c *Container) { + c.Kill() wg.Add(-1) - }() + }(container) } wg.Wait() return os.RemoveAll(runtime.root) From 668c8b447264cd3d9d268a013bc29aff1942ba68 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 3 Apr 2013 11:11:34 +0200 Subject: [PATCH 4/6] use wg.Done() isntead of wg.Add(-1) Upstream-commit: cab31fd5128fbfcc2f1b44d3d643fe96a28c88fc Component: engine --- components/engine/runtime_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/runtime_test.go b/components/engine/runtime_test.go index 6551c24dc4..67221273a2 100644 --- a/components/engine/runtime_test.go +++ b/components/engine/runtime_test.go @@ -23,7 +23,7 @@ func nuke(runtime *Runtime) error { wg.Add(1) go func(c *Container) { c.Kill() - wg.Add(-1) + wg.Done() }(container) } wg.Wait() From d6aac87dba7e63d43322932d86b9b255c82fc941 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 3 Apr 2013 11:18:23 +0200 Subject: [PATCH 5/6] replace unreachable returns with panics Not only is this a more common idiom, it'll make finding bugs easier, and it'll make porting to Go 1.1 easier. Go 1.1 will not require the final return or panic because it has a notion of terminating statements. Upstream-commit: 22f1cc955dbf25132e69d126f8db0e5498bffbd2 Component: engine --- components/engine/container.go | 2 +- components/engine/network.go | 2 +- components/engine/utils.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/container.go b/components/engine/container.go index adb1602162..872bbb000b 100644 --- a/components/engine/container.go +++ b/components/engine/container.go @@ -626,7 +626,7 @@ func (container *Container) WaitTimeout(timeout time.Duration) error { case <-done: return nil } - return nil + panic("unreachable") } func (container *Container) EnsureMounted() error { diff --git a/components/engine/network.go b/components/engine/network.go index c050609d16..e92a4e5400 100644 --- a/components/engine/network.go +++ b/components/engine/network.go @@ -184,7 +184,7 @@ func (alloc *PortAllocator) Release(port int) error { default: return errors.New("Too many ports have been released") } - return nil + panic("unreachable") } func newPortAllocator(start, end int) (*PortAllocator, error) { diff --git a/components/engine/utils.go b/components/engine/utils.go index e295239f7f..5ee84239b1 100644 --- a/components/engine/utils.go +++ b/components/engine/utils.go @@ -202,7 +202,7 @@ func (r *bufReader) Read(p []byte) (n int, err error) { } r.wait.Wait() } - return + panic("unreachable") } func (r *bufReader) Close() error { From 3025ceb6c58999d0e8f445f4d6476ab390646c00 Mon Sep 17 00:00:00 2001 From: Dominik Honnef Date: Wed, 3 Apr 2013 11:19:48 +0200 Subject: [PATCH 6/6] remove superfluous panic Upstream-commit: 14d3880daf9bdfe52248b5b0548a5522161baf2c Component: engine --- components/engine/runtime_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/components/engine/runtime_test.go b/components/engine/runtime_test.go index 67221273a2..d35432bda1 100644 --- a/components/engine/runtime_test.go +++ b/components/engine/runtime_test.go @@ -90,7 +90,6 @@ func newTestRuntime() (*Runtime, error) { return nil, err } if err := CopyDirectory(unitTestStoreBase, root); err != nil { - panic(err) return nil, err }