fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-26 19:21:44 +00:00
Code Issues Projects Releases Wiki Activity

APIResponse -> RestResponse

Browse Source
This commit is contained in:
Jae Kwon
2015-04-01 01:46:41 -07:00
parent ff04be396b
commit 42be73724e
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
rpc/http_server.go
View File

@ -25,28 +25,39 @@ func StartHTTPServer() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
type APIStatus string type RPCStatus string
const ( const (
API_OK APIStatus = "OK" RPC_OK RPCStatus = "OK"
API_ERROR APIStatus = "ERROR" RPC_ERROR RPCStatus = "ERROR"
API_INVALID_PARAM APIStatus = "INVALID_PARAM" RPC_INVALID_PARAM RPCStatus = "INVALID_PARAM"
API_UNAUTHORIZED APIStatus = "UNAUTHORIZED" RPC_UNAUTHORIZED RPCStatus = "UNAUTHORIZED"
API_REDIRECT APIStatus = "REDIRECT" RPC_REDIRECT RPCStatus = "REDIRECT"
) )
type APIResponse struct { //-----------------------------------------------------------------------------
Status APIStatus `json:"status"`
type JSONRPCResponse struct {
JSONRPC int `json:"jsonrpc"`
Result interface{}
Error string
Id string
}
//-----------------------------------------------------------------------------
type RestResponse struct {
Status RPCStatus `json:"status"`
Data interface{} `json:"data"` Data interface{} `json:"data"`
Error string `json:"error"` Error string `json:"error"`
} }
func (res APIResponse) StatusError() string { func (res RestResponse) StatusError() string {
return fmt.Sprintf("Status(%v) %v", res.Status, res.Error) return fmt.Sprintf("Status(%v) %v", res.Status, res.Error)
} }
func WriteAPIResponse(w http.ResponseWriter, status APIStatus, data interface{}, responseErr string) { func WriteRestResponse(w http.ResponseWriter, status RPCStatus, data interface{}, responseErr string) {
res := APIResponse{} res := RestResponse{}
res.Status = status res.Status = status
if data == nil { if data == nil {
// so json doesn't vommit // so json doesn't vommit
@ -58,22 +69,22 @@ func WriteAPIResponse(w http.ResponseWriter, status APIStatus, data interface{},
buf, n, err := new(bytes.Buffer), new(int64), new(error) buf, n, err := new(bytes.Buffer), new(int64), new(error)
binary.WriteJSON(res, buf, n, err) binary.WriteJSON(res, buf, n, err)
if *err != nil { if *err != nil {
log.Warn("Failed to write JSON APIResponse", "error", err) log.Warn("Failed to write JSON RestResponse", "error", err)
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
w.WriteHeader(200) w.WriteHeader(200)
/* Bad idea: (e.g. hard to use with jQuery) /* Bad idea: (e.g. hard to use with jQuery)
switch res.Status { switch res.Status {
case API_OK: case RPC_OK:
w.WriteHeader(200) w.WriteHeader(200)
case API_ERROR: case RPC_ERROR:
w.WriteHeader(400) w.WriteHeader(400)
case API_UNAUTHORIZED: case RPC_UNAUTHORIZED:
w.WriteHeader(401) w.WriteHeader(401)
case API_INVALID_PARAM: case RPC_INVALID_PARAM:
w.WriteHeader(420) w.WriteHeader(420)
case API_REDIRECT: case RPC_REDIRECT:
w.WriteHeader(430) w.WriteHeader(430)
default: default:
w.WriteHeader(440) w.WriteHeader(440)
@ -81,6 +92,8 @@ func WriteAPIResponse(w http.ResponseWriter, status APIStatus, data interface{},
w.Write(buf.Bytes()) w.Write(buf.Bytes())
} }
//-----------------------------------------------------------------------------
// Wraps an HTTP handler, adding error logging. // Wraps an HTTP handler, adding error logging.
// //
// If the inner function panics, the outer function recovers, logs, sends an // If the inner function panics, the outer function recovers, logs, sends an
@ -113,9 +126,9 @@ func RecoverAndLogHandler(handler http.Handler) http.Handler {
// at least to my localhost. // at least to my localhost.
if e := recover(); e != nil { if e := recover(); e != nil {
// If APIResponse, // If RestResponse,
if res, ok := e.(APIResponse); ok { if res, ok := e.(RestResponse); ok {
WriteAPIResponse(rww, res.Status, nil, res.Error) WriteRestResponse(rww, res.Status, nil, res.Error)
} else { } else {
// For the rest, // For the rest,
rww.WriteHeader(http.StatusInternalServerError) rww.WriteHeader(http.StatusInternalServerError)