tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #817 from tgerring/rpcglog

Browse Source 
Remove old logger from RPC pkg
This commit is contained in:
Jeffrey Wilcke 2015-04-27 14:51:00 -07:00
commit 182d484aa7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -52,7 +52,7 @@ Automated (dev) builds
* Ubuntu * Ubuntu
[trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/) | [trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/) |
[utopic](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-utopic/latest/) [utopic](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-utopic/latest/)
* [Windows] Coming soon™ * [Windows 64-bit](https://build.ethdev.com/builds/Windows%20Go%20develop%20branch/Geth-Win64-latest.7z)
Executables Executables
=========== ===========

6
rpc/api.go
View File

@ -63,8 +63,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
case "eth_mining": case "eth_mining":
*reply = api.xeth().IsMining() *reply = api.xeth().IsMining()
case "eth_gasPrice": case "eth_gasPrice":
v := xeth.DefaultGas() v := xeth.DefaultGasPrice()
*reply = newHexData(v.Bytes()) *reply = newHexNum(v.Bytes())
case "eth_accounts": case "eth_accounts":
*reply = api.xeth().Accounts() *reply = api.xeth().Accounts()
case "eth_blockNumber": case "eth_blockNumber":
@ -489,6 +489,6 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
return NewNotImplementedError(req.Method) return NewNotImplementedError(req.Method)
} }
rpclogger.DebugDetailf("Reply: %T %s", reply, reply) glog.V(logger.Detail).Infof("Reply: %T %s\n", reply, reply)
return nil return nil
} }

5
rpc/http.go
View File

@ -13,7 +13,6 @@ import (
"github.com/rs/cors" "github.com/rs/cors"
) )
var rpclogger = logger.NewLogger("RPC")
var rpclistener *stoppableTCPListener var rpclistener *stoppableTCPListener
const ( const (
@ -31,7 +30,7 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
l, err := newStoppableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort)) l, err := newStoppableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
if err != nil { 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 return err
} }
rpclistener = l rpclistener = l
@ -136,7 +135,7 @@ func send(writer io.Writer, v interface{}) (n int, err error) {
var payload []byte var payload []byte
payload, err = json.MarshalIndent(v, "", "\t") payload, err = json.MarshalIndent(v, "", "\t")
if err != nil { if err != nil {
rpclogger.Fatalln("Error marshalling JSON", err) glog.V(logger.Error).Infoln("Error marshalling JSON", err)
return 0, err return 0, err
} }
glog.V(logger.Detail).Infof("Sending payload: %s", payload) glog.V(logger.Detail).Infof("Sending payload: %s", payload)