瀏覽代碼

Merge pull request #817 from tgerring/rpcglog

Remove old logger from RPC pkg
Jeffrey Wilcke 10 年之前
父節點
當前提交
182d484aa7
共有 3 個文件被更改,包括 6 次插入7 次删除
  1. 1 1
      README.md
  2. 3 3
      rpc/api.go
  3. 2 3
      rpc/http.go

+ 1 - 1
README.md

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

+ 3 - 3
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
 }

+ 2 - 3
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)