gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1721 from bas-vk/console-error-parsing

Browse Source 
Improved console error handling
This commit is contained in:
Felix Lange
2015-08-26 18:55:31 +02:00
parent 847794a321 f448310eef
commit 3df6f3fc14
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rpc/jeth.go
View File

@@ -44,11 +44,12 @@ func NewJeth(ethApi shared.EthereumApi, re *jsre.JSRE, client comms.EthereumClie
} }
func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) { func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) {
errObj := fmt.Sprintf("{\"message\": \"%s\", \"code\": %d}", msg, code) m := shared.NewRpcErrorResponse(id, shared.JsonRpcVersion, code, fmt.Errorf(msg))
retResponse := fmt.Sprintf("ret_response = JSON.parse('{\"jsonrpc\": \"%s\", \"id\": %v, \"error\": %s}');", shared.JsonRpcVersion, id, errObj) errObj, _ := json.Marshal(m.Error)
errRes, _ := json.Marshal(m)
call.Otto.Run("ret_error = " + errObj) call.Otto.Run("ret_error = " + string(errObj))
res, _ := call.Otto.Run(retResponse) res, _ := call.Otto.Run("ret_response = " + string(errRes))
return res return res
} }

6
rpc/shared/types.go
View File

@@ -74,11 +74,9 @@ type ErrorObject struct {
} }
// Create RPC error response, this allows for custom error codes // Create RPC error response, this allows for custom error codes
func NewRpcErrorResponse(id interface{}, jsonrpcver string, errCode int, err error) *interface{} { func NewRpcErrorResponse(id interface{}, jsonrpcver string, errCode int, err error) *ErrorResponse {
var response interface{}
jsonerr := &ErrorObject{errCode, err.Error()} jsonerr := &ErrorObject{errCode, err.Error()}
response = ErrorResponse{Jsonrpc: jsonrpcver, Id: id, Error: jsonerr} response := ErrorResponse{Jsonrpc: jsonrpcver, Id: id, Error: jsonerr}
glog.V(logger.Detail).Infof("Generated error response: %s", response) glog.V(logger.Detail).Infof("Generated error response: %s", response)
return &response return &response