From a7d1fd42d8d693ccb595fdb614965c6a6a079bd1 Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Tue, 18 Nov 2014 08:17:01 -0800
Subject: [PATCH] updating daemon addr output

---
 cmd/ipfs/daemon.go   | 44 +++++++++++++++++++++++++-------------------
 test/lib/test-lib.sh |  2 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index 2b3ee26ae..29e22b9ed 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -21,6 +21,8 @@ const (
 	mountKwd      = "mount"
 	ipfsMountKwd  = "mount-ipfs"
 	ipnsMountKwd  = "mount-ipns"
+	// apiAddrKwd    = "address-api"
+	// swarmAddrKwd  = "address-swarm"
 )
 
 var daemonCmd = &cmds.Command{
@@ -40,6 +42,10 @@ the daemon.
 		cmds.BoolOption(mountKwd, "Mounts IPFS to the filesystem"),
 		cmds.StringOption(ipfsMountKwd, "Path to the mountpoint for IPFS (if using --mount)"),
 		cmds.StringOption(ipnsMountKwd, "Path to the mountpoint for IPNS (if using --mount)"),
+
+		// TODO: add way to override addresses. tricky part: updating the config if also --init.
+		// cmds.StringOption(apiAddrKwd, "Address for the daemon rpc API (overrides config)"),
+		// cmds.StringOption(swarmAddrKwd, "Address for the swarm socket (overrides config)"),
 	},
 	Subcommands: map[string]*cmds.Command{},
 	Run:         daemonFunc,
@@ -86,19 +92,16 @@ func daemonFunc(req cmds.Request) (interface{}, error) {
 	}
 	defer lock.Close()
 
-	// make sure we construct online node.
+	// OK!!! Now we're ready to construct the node.
+	// make sure we construct an online node.
 	ctx.Online = true
 	node, err := ctx.GetNode()
 	if err != nil {
 		return nil, err
 	}
 
-	addr, err := ma.NewMultiaddr(cfg.Addresses.API)
-	if err != nil {
-		return nil, err
-	}
-
-	_, host, err := manet.DialArgs(addr)
+	// verify api address is valid multiaddr
+	apiMaddr, err := ma.NewMultiaddr(cfg.Addresses.API)
 	if err != nil {
 		return nil, err
 	}
@@ -131,6 +134,17 @@ func daemonFunc(req cmds.Request) (interface{}, error) {
 		}
 	}
 
+	return nil, listenAndServeAPI(node, req, apiMaddr)
+}
+
+func listenAndServeAPI(node *core.IpfsNode, req cmds.Request, addr ma.Multiaddr) error {
+
+	_, host, err := manet.DialArgs(addr)
+	if err != nil {
+		return err
+	}
+
+	server := manners.NewServer()
 	mux := http.NewServeMux()
 	cmdHandler := cmdsHttp.NewHandler(*req.Context(), commands.Root)
 	mux.Handle(cmdsHttp.ApiPath+"/", cmdHandler)
@@ -138,15 +152,6 @@ func daemonFunc(req cmds.Request) (interface{}, error) {
 	ifpsHandler := &ipfsHandler{node}
 	mux.Handle("/ipfs/", ifpsHandler)
 
-	err = listenAndServe(node, mux, host)
-	return nil, err
-}
-
-func listenAndServe(node *core.IpfsNode, mux *http.ServeMux, host string) error {
-
-	fmt.Printf("API server listening on '%s'\n", host)
-	s := manners.NewServer()
-
 	done := make(chan struct{}, 1)
 	defer func() {
 		done <- struct{}{}
@@ -160,11 +165,12 @@ func listenAndServe(node *core.IpfsNode, mux *http.ServeMux, host string) error
 			return
 		}
 
-		log.Info("terminating daemon at %s...", host)
-		s.Shutdown <- true
+		log.Info("terminating daemon at %s...", addr)
+		server.Shutdown <- true
 	}()
 
-	if err := s.ListenAndServe(host, mux); err != nil {
+	fmt.Printf("daemon listening on %s\n", addr)
+	if err := server.ListenAndServe(host, mux); err != nil {
 		return err
 	}
 
diff --git a/test/lib/test-lib.sh b/test/lib/test-lib.sh
index 219d7e5bf..d74c858b3 100644
--- a/test/lib/test-lib.sh
+++ b/test/lib/test-lib.sh
@@ -58,7 +58,7 @@ test_launch_ipfs_mount() {
 
 	test_expect_success FUSE "'ipfs daemon' output looks good" '
 		IPFS_PID=$! &&
-		echo "API server listening on '\''127.0.0.1:5001'\''" >expected &&
+		echo "daemon listening on /ip4/127.0.0.1/tcp/5001" >expected &&
 		test_cmp_repeat_10_sec expected actual
 	'