diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-12 02:22:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-12 02:22:38 +0800 |
| commit | 1fc3524e40ced2e780f6b90fa4ca7725c839976f (patch) | |
| tree | 1d3508d967c9269fd89b0fa2d45313e4c821c170 /rpc/ws | |
| parent | df49c609a0fd055a4f0dac89db6863ad5532228f (diff) | |
| parent | ebc506dae8a15e5dcce4e4369e21d04e3b8f9aa4 (diff) | |
| download | dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.gz dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.bz2 dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.lz dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.xz dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.zst dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'rpc/ws')
| -rw-r--r-- | rpc/ws/server.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rpc/ws/server.go b/rpc/ws/server.go index 6be4e8ce9..100713c10 100644 --- a/rpc/ws/server.go +++ b/rpc/ws/server.go @@ -94,9 +94,10 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler { var jsonrpcver string = "2.0" fn := func(conn *websocket.Conn) { for { - wslogger.Debugln("Handling request") + wslogger.Debugln("Handling connection") var reqParsed rpc.RpcRequest + // reqParsed, reqerr := JSON.ParseRequestBody(conn.Request()) if err := websocket.JSON.Receive(conn, &reqParsed); err != nil { jsonerr := &rpc.RpcErrorObject{-32700, rpc.ErrorParseRequest} JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr}) @@ -108,7 +109,7 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler { if reserr != nil { wslogger.Warnln(reserr) jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()} - JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr}) + JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr}) continue } |