diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-12 06:46:54 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-12 06:46:54 +0800 |
| commit | b64ad7a2a6544564b68f362f18c70476310396d6 (patch) | |
| tree | e31866584192023142f17bad3aeff84a015c7f2c /rpc/ws | |
| parent | da2fae0e437f9467a943acfe0571a8a24e8e76fd (diff) | |
| parent | 3f6baa45a7fb1ae5fd7966d2763a2a776a65eb96 (diff) | |
| download | dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.gz dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.bz2 dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.lz dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.xz dexon-b64ad7a2a6544564b68f362f18c70476310396d6.tar.zst dexon-b64ad7a2a6544564b68f362f18c70476310396d6.zip | |
Merge branch 'develop' into miner
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 } |