From cda68a19d01abf3b6eb91df0b02edf4a2672de47 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Mon, 10 Nov 2014 22:45:43 -0800
Subject: [PATCH] refactor(ipfs2/main) return err

---
 cmd/ipfs2/main.go | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/cmd/ipfs2/main.go b/cmd/ipfs2/main.go
index 7178bd351..ab21894e8 100644
--- a/cmd/ipfs2/main.go
+++ b/cmd/ipfs2/main.go
@@ -76,7 +76,10 @@ func run() error {
 		return nil
 	}
 
-	res := callCommand(req, root)
+	res, err := callCommand(req, root)
+	if err != nil {
+		return err
+	}
 	outputResponse(res, root)
 
 	return nil
@@ -157,45 +160,40 @@ func handleHelpOption(req cmds.Request, root *cmds.Command) (helpTextDisplayed b
 	return false, nil
 }
 
-func callCommand(req cmds.Request, root *cmds.Command) cmds.Response {
+func callCommand(req cmds.Request, root *cmds.Command) (cmds.Response, error) {
 	var res cmds.Response
 
-	if root == Root {
+	if root == Root { // TODO explain what it means when root == Root
 		res = root.Call(req)
 
 	} else {
 		local, err := req.Option("local").Bool()
 		if err != nil {
-			fmt.Println(err)
-			exit(1)
+			return nil, err
 		}
 
 		if (!req.Option("local").Found() || !local) && daemon.Locked(req.Context().ConfigRoot) {
 			addr, err := ma.NewMultiaddr(req.Context().Config.Addresses.API)
 			if err != nil {
-				fmt.Println(err)
-				exit(1)
+				return nil, err
 			}
 
 			_, host, err := manet.DialArgs(addr)
 			if err != nil {
-				fmt.Println(err)
-				exit(1)
+				return nil, err
 			}
 
 			client := cmdsHttp.NewClient(host)
 
 			res, err = client.Send(req)
 			if err != nil {
-				fmt.Println(err)
-				exit(1)
+				return nil, err
 			}
 
 		} else {
 			node, err := core.NewIpfsNode(req.Context().Config, false)
 			if err != nil {
-				fmt.Println(err)
-				exit(1)
+				return nil, err
 			}
 			defer node.Close()
 			req.Context().Node = node
@@ -204,7 +202,7 @@ func callCommand(req cmds.Request, root *cmds.Command) cmds.Response {
 		}
 	}
 
-	return res
+	return res, nil
 }
 
 func outputResponse(res cmds.Response, root *cmds.Command) {