From cb213c5a68168de95e7519ae246fbb941d2b22d3 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@docker.com>
Date: Thu, 1 May 2014 17:26:46 -0700
Subject: [PATCH] Better error messages

---
 swarmd/swarmd.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/swarmd/swarmd.go b/swarmd/swarmd.go
index fced1ae7e6..e300eb1c71 100644
--- a/swarmd/swarmd.go
+++ b/swarmd/swarmd.go
@@ -13,7 +13,7 @@ func main() {
 	eng := engine.New()
 	eng.Logging = false
 	if err := backends.Debug().Install(eng); err != nil {
-		Fatalf("%v", err)
+		Fatalf("backend install: %v", err)
 	}
 	eng.Register(os.Args[0], server.ServeApi)
 
@@ -24,7 +24,7 @@ func main() {
 		serve.Stdout.Add(os.Stdout)
 		serve.Stderr.Add(os.Stderr)
 		if err := serve.Run(); err != nil {
-			Fatalf("%v", err)
+			Fatalf("serveapi: %v", err)
 		}
 	}()
 	// There is a race condition in engine.ServeApi.
@@ -32,13 +32,17 @@ func main() {
 	time.Sleep(1 * time.Second)
 	// Notify that we're ready to receive connections
 	if err := eng.Job("acceptconnections").Run(); err != nil {
-		Fatalf("%v", err)
+		Fatalf("acceptconnections: %v", err)
 	}
 	// Inifinite loop
 	<-make(chan struct{})
 }
 
 func Fatalf(msg string, args ...interface{}) {
+	if !strings.HasSuffix(msg, "\n") {
+		msg = msg + "\n"
+	}
+	panic(msg)
 	fmt.Fprintf(os.Stderr, msg, args...)
 	os.Exit(1)
 }