rpc.StartHTTPServer listener bug fix

This commit is contained in:
Jae Kwon
2015-04-23 18:33:20 -07:00
parent 66ff985cd2
commit d9bfe82d93
6 changed files with 17 additions and 19 deletions
+7 -7
View File
@@ -13,17 +13,17 @@ import (
"github.com/tendermint/tendermint/alert"
"github.com/tendermint/tendermint/binary"
. "github.com/tendermint/tendermint/common"
"github.com/tendermint/tendermint/p2p"
)
func StartHTTPServer(listener p2p.Listener, handler http.Handler) {
log.Info(Fmt("Starting RPC HTTP server on ext:%v int:%v",
listener.ExternalAddress(),
listener.InternalAddress()))
func StartHTTPServer(listenAddr string, handler http.Handler) {
log.Info(Fmt("Starting RPC HTTP server on %v", listenAddr))
go func() {
netListener := listener.(*p2p.DefaultListener).NetListener()
listener, err := net.Listen("tcp", listenAddr)
if err != nil {
Exit(Fmt("Failed to listen to %v", listenAddr))
}
res := http.Serve(
netListener,
listener,
RecoverAndLogHandler(handler),
)
log.Crit("RPC HTTP server stopped", "result", res)
-2
View File
@@ -16,7 +16,6 @@ func testStatus(t *testing.T, typ string) {
if err != nil {
t.Fatal(err)
}
fmt.Println(">>>", resp)
if resp.Network != config.App().GetString("Network") {
t.Fatal(fmt.Errorf("Network mismatch: got %s expected %s",
resp.Network, config.App().Get("Network")))
@@ -29,7 +28,6 @@ func testGenPriv(t *testing.T, typ string) {
if err != nil {
t.Fatal(err)
}
fmt.Println(">>>", resp)
if len(resp.PrivAccount.Address) == 0 {
t.Fatal("Failed to generate an address")
}