Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
182d484a
Commit
182d484a
authored
Apr 27, 2015
by
Jeffrey Wilcke
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #817 from tgerring/rpcglog
Remove old logger from RPC pkg
parents
f54c2e75
3ad5243b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
README.md
README.md
+1
-1
api.go
rpc/api.go
+3
-3
http.go
rpc/http.go
+2
-3
No files found.
README.md
View file @
182d484a
...
@@ -52,7 +52,7 @@ Automated (dev) builds
...
@@ -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
===========
===========
...
...
rpc/api.go
View file @
182d484a
...
@@ -63,8 +63,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
...
@@ -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
.
DefaultGas
Price
()
*
reply
=
newHex
Data
(
v
.
Bytes
())
*
reply
=
newHex
Num
(
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
...
@@ -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
}
}
rpc/http.go
View file @
182d484a
...
@@ -13,7 +13,6 @@ import (
...
@@ -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 {
...
@@ -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
.
Error
f
(
"Can't listen on %s:%d: %v"
,
config
.
ListenAddress
,
config
.
ListenPort
,
err
)
glog
.
V
(
logger
.
Error
)
.
Info
f
(
"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) {
...
@@ -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
.
Fatal
ln
(
"Error marshalling JSON"
,
err
)
glog
.
V
(
logger
.
Error
)
.
Info
ln
(
"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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment