From d894d6382ffe0a62d99c8e338240d345c9944c51 Mon Sep 17 00:00:00 2001 From: verokarhu Date: Tue, 16 Sep 2014 20:05:48 +0300 Subject: [PATCH] daemon listener to http serve code --- cmd/ipfs/serve.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cmd/ipfs/serve.go b/cmd/ipfs/serve.go index af6d1fb41..0d1fb1d3b 100644 --- a/cmd/ipfs/serve.go +++ b/cmd/ipfs/serve.go @@ -3,8 +3,10 @@ package main import ( "errors" "fmt" - "github.com/gonuts/flag" - "github.com/jbenet/commander" + + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag" + "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander" + "github.com/jbenet/go-ipfs/daemon" h "github.com/jbenet/go-ipfs/server/http" ) @@ -36,13 +38,20 @@ func serveHttpCmd(c *commander.Command, _ []string) error { return errors.New("invalid port number") } - hostname := c.Flag.Lookup("hostname").Value.Get().(string) - - n, err := localNode() + n, err := localNode(true) if err != nil { return err } + fmt.Println("starting new daemon listener...") + dl, err := daemon.NewDaemonListener(n, "localhost:12345") + if err != nil { + return err + } + go dl.Listen() + defer dl.Close() + + hostname := c.Flag.Lookup("hostname").Value.Get().(string) address := fmt.Sprintf("%s:%d", hostname, port) fmt.Printf("Serving on %s\n", address)