diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:59:51 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:59:51 +0800 |
| commit | ef6c7bd726f78e4134d207b58f1efe504bbad40e (patch) | |
| tree | e7d6589314ec1490c45adb2ac5b94423a250eb06 /rpc/ws | |
| parent | c6af5f0a275608ea6c797ef826e6090885f24eac (diff) | |
| parent | d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9 (diff) | |
| download | dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.tar dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.tar.gz dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.tar.bz2 dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.tar.lz dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.tar.xz dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.tar.zst dexon-ef6c7bd726f78e4134d207b58f1efe504bbad40e.zip | |
Merge pull request #300 from tgerring/jsonrpc
Allow RPC ID to be string or null
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 } |