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

ethlog => logger

Browse Source
This commit is contained in:
obscuren
2014-10-31 12:56:05 +01:00
parent fd9da72536
commit b1c247231b
33 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/packages.go
View File

@@ -208,7 +208,7 @@ func (p *EthereumApi) GetStorageAt(args *GetStorageArgs, reply *string) error {
i, _ := new(big.Int).SetString(args.Key, 10)
hx = ethutil.Bytes2Hex(i.Bytes())
}
logger.Debugf("GetStorageAt(%s, %s)\n", args.Address, hx)
jsonlogger.Debugf("GetStorageAt(%s, %s)\n", args.Address, hx)
value := state.Storage(ethutil.Hex2Bytes(hx))
*reply = NewSuccessRes(GetStorageAtRes{Address: args.Address, Key: args.Key, Value: value.Str()})
return nil

12
rpc/server.go
View File

@@ -6,11 +6,11 @@ import (
"net/rpc"
"net/rpc/jsonrpc"
"github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/ethpipe"
"github.com/ethereum/go-ethereum/logger"
)
var logger = ethlog.NewLogger("JSON")
var jsonlogger = logger.NewLogger("JSON")
type JsonRpcServer struct {
quit chan bool
@@ -28,7 +28,7 @@ out:
}
}
logger.Infoln("Shutdown JSON-RPC server")
jsonlogger.Infoln("Shutdown JSON-RPC server")
}
func (s *JsonRpcServer) Stop() {
@@ -36,7 +36,7 @@ func (s *JsonRpcServer) Stop() {
}
func (s *JsonRpcServer) Start() {
logger.Infoln("Starting JSON-RPC server")
jsonlogger.Infoln("Starting JSON-RPC server")
go s.exitHandler()
rpc.Register(&EthereumApi{pipe: s.pipe})
rpc.HandleHTTP()
@@ -44,10 +44,10 @@ func (s *JsonRpcServer) Start() {
for {
conn, err := s.listener.Accept()
if err != nil {
logger.Infoln("Error starting JSON-RPC:", err)
jsonlogger.Infoln("Error starting JSON-RPC:", err)
break
}
logger.Debugln("Incoming request.")
jsonlogger.Debugln("Incoming request.")
go jsonrpc.ServeConn(conn)
}
}