aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-04-28 05:51:00 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-04-28 05:51:00 +0800
commit182d484aa70bcd5b22117f02333b1fd3b1535dcb (patch)
tree870e90d12e37b2062c237c16fa98eb33ee704ac1 /rpc
parentf54c2e75c8b3ba3464605ce3febd64645b28dd28 (diff)
parent3ad5243b188820ef61624ea761344d8fd3391e49 (diff)
downloadgo-tangerine-182d484aa70bcd5b22117f02333b1fd3b1535dcb.tar.gz
go-tangerine-182d484aa70bcd5b22117f02333b1fd3b1535dcb.tar.zst
go-tangerine-182d484aa70bcd5b22117f02333b1fd3b1535dcb.zip
Merge pull request #817 from tgerring/rpcglog
Remove old logger from RPC pkg
Diffstat (limited to 'rpc')
-rw-r--r--rpc/api.go6
-rw-r--r--rpc/http.go5
2 files changed, 5 insertions, 6 deletions
diff --git a/rpc/api.go b/rpc/api.go
index 085d8cf27..5930a4c7b 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -63,8 +63,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
case "eth_mining":
*reply = api.xeth().IsMining()
case "eth_gasPrice":
- v := xeth.DefaultGas()
- *reply = newHexData(v.Bytes())
+ v := xeth.DefaultGasPrice()
+ *reply = newHexNum(v.Bytes())
case "eth_accounts":
*reply = api.xeth().Accounts()
case "eth_blockNumber":
@@ -489,6 +489,6 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
return NewNotImplementedError(req.Method)
}
- rpclogger.DebugDetailf("Reply: %T %s", reply, reply)
+ glog.V(logger.Detail).Infof("Reply: %T %s\n", reply, reply)
return nil
}
diff --git a/rpc/http.go b/rpc/http.go
index f9c646908..4760601d8 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -13,7 +13,6 @@ import (
"github.com/rs/cors"
)
-var rpclogger = logger.NewLogger("RPC")
var rpclistener *stoppableTCPListener
const (
@@ -31,7 +30,7 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
l, err := newStoppableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
if err != nil {
- rpclogger.Errorf("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err)
+ glog.V(logger.Error).Infof("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err)
return err
}
rpclistener = l
@@ -136,7 +135,7 @@ func send(writer io.Writer, v interface{}) (n int, err error) {
var payload []byte
payload, err = json.MarshalIndent(v, "", "\t")
if err != nil {
- rpclogger.Fatalln("Error marshalling JSON", err)
+ glog.V(logger.Error).Infoln("Error marshalling JSON", err)
return 0, err
}
glog.V(logger.Detail).Infof("Sending payload: %s", payload)