/rpcaddr should be storing a multiaddr

client expects a multiaddr. server was writing a bsaddr
ipfs · Oct 2, 2014 · a3fd5a0 · a3fd5a0
1 parent 874d612
commit a3fd5a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -63,7 +63,12 @@ func NewDaemonListener(ipfsnode *core.IpfsNode, addr *ma.Multiaddr, confdir stri
 		return nil, err
 	}
 
-	_, err = ofi.Write([]byte(host))
+	mstr, err := addr.String()
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = ofi.Write([]byte(mstr))
 	if err != nil {
 		log.Warning("Could not write to rpcaddress file: %s", err)
 		return nil, err

diff --git a/daemon/daemon_client.go b/daemon/daemon_client.go
@@ -67,6 +67,7 @@ func SendCommand(command *Command, confdir string) error {
 		return err
 	}
 
+	log.Info("Daemon address: %s", server)
 	maddr, err := ma.NewMultiaddr(server)
 	if err != nil {
 		return err