Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
ead3dd97
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ead3dd97
编写于
4月 16, 2015
作者:
B
Bas van Kervel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Stop accepted and alive connections (http keep-alive) when the rpc service is stopped
上级
57f93d25
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
38 deletion
+67
-38
rpc/http.go
rpc/http.go
+11
-11
rpc/types.go
rpc/types.go
+56
-27
未找到文件。
rpc/http.go
浏览文件 @
ead3dd97
...
...
@@ -14,7 +14,7 @@ import (
)
var
rpclogger
=
logger
.
NewLogger
(
"RPC"
)
var
rpclistener
*
Controll
ableTCPListener
var
rpclistener
*
Stopp
ableTCPListener
const
(
jsonrpcver
=
"2.0"
...
...
@@ -22,12 +22,14 @@ const (
)
func
Start
(
pipe
*
xeth
.
XEth
,
config
RpcConfig
)
error
{
if
rpclistener
!=
nil
{
// listener already running
glog
.
Infoln
(
"RPC listener already running"
)
return
fmt
.
Errorf
(
"RPC already running on %s"
,
rpclistener
.
Addr
()
.
String
())
if
rpclistener
!=
nil
{
if
fmt
.
Sprintf
(
"%s:%d"
,
config
.
ListenAddress
,
config
.
ListenPort
)
!=
rpclistener
.
Addr
()
.
String
()
{
return
fmt
.
Errorf
(
"RPC service already running on %s "
,
rpclistener
.
Addr
()
.
String
())
}
return
nil
// RPC service already running on given host/port
}
l
,
err
:=
New
Controll
ableTCPListener
(
fmt
.
Sprintf
(
"%s:%d"
,
config
.
ListenAddress
,
config
.
ListenPort
))
l
,
err
:=
New
Stopp
ableTCPListener
(
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
)
return
err
...
...
@@ -41,7 +43,7 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
opts
.
AllowedOrigins
=
[]
string
{
config
.
CorsDomain
}
c
:=
cors
.
New
(
opts
)
handler
=
c
.
Handler
(
JSONRPC
(
pipe
)
)
handler
=
NewStoppableHandler
(
c
.
Handler
(
JSONRPC
(
pipe
)),
l
.
stop
)
}
else
{
handler
=
JSONRPC
(
pipe
)
}
...
...
@@ -52,13 +54,11 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
}
func
Stop
()
error
{
if
rpclistener
==
nil
{
// listener not running
glog
.
Infoln
(
"RPC listener not running"
)
r
eturn
nil
if
rpclistener
!=
nil
{
rpclistener
.
Stop
(
)
r
pclistener
=
nil
}
rpclistener
.
Stop
()
rpclistener
=
nil
return
nil
}
...
...
rpc/types.go
浏览文件 @
ead3dd97
...
...
@@ -25,8 +25,11 @@ import (
"errors"
"net"
"net/http"
"time"
"io"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
)
...
...
@@ -266,39 +269,64 @@ type ListenerStoppedError struct {
msg
string
}
func
(
self
ListenerStoppedError
)
Timout
()
bool
{
return
false
func
(
self
ListenerStoppedError
)
Error
()
string
{
return
self
.
msg
}
func
(
self
ListenerStoppedError
)
Temporary
()
bool
{
return
false
var
listenerStoppedError
=
ListenerStoppedError
{
"Listener stopped"
}
type
StoppableTCPListener
struct
{
*
net
.
TCPListener
stop
*
chan
struct
{}
// closed when the listener must stop
}
func
(
self
ListenerStoppedError
)
Error
()
string
{
return
self
.
msg
// Wraps the default handler and checks if the RPC service was stopped. In that case it returns an
// error indicating that the service was stopped. This will only happen for connections which are
// kept open (HTTP keep-alive) when the RPC service was shutdown.
func
NewStoppableHandler
(
h
http
.
Handler
,
stop
*
chan
struct
{})
http
.
Handler
{
return
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
select
{
case
<-*
stop
:
w
.
Header
()
.
Set
(
"Content-Type"
,
"application/json"
)
jsonerr
:=
&
RpcErrorObject
{
-
32603
,
"RPC service stopt"
}
send
(
w
,
&
RpcErrorResponse
{
Jsonrpc
:
jsonrpcver
,
Id
:
nil
,
Error
:
jsonerr
})
default
:
h
.
ServeHTTP
(
w
,
r
)
}
})
}
type
ControllableTCPListener
struct
{
*
net
.
TCPListener
stop
chan
struct
{}
// Stop the listener and all accepted and still active connections.
func
(
self
*
StoppableTCPListener
)
Stop
()
{
close
(
*
self
.
stop
)
}
var
listenerStoppedError
ListenerStoppedError
func
NewStoppableTCPListener
(
addr
string
)
(
*
StoppableTCPListener
,
error
)
{
wl
,
err
:=
net
.
Listen
(
"tcp"
,
addr
)
if
err
!=
nil
{
return
nil
,
err
}
func
(
self
*
ControllableTCPListener
)
Stop
()
{
close
(
self
.
stop
)
if
tcpl
,
ok
:=
wl
.
(
*
net
.
TCPListener
);
ok
{
stop
:=
make
(
chan
struct
{})
l
:=
&
StoppableTCPListener
{
tcpl
,
&
stop
}
return
l
,
nil
}
return
nil
,
errors
.
New
(
"Unable to create TCP listener for RPC service"
)
}
func
(
self
*
Controll
ableTCPListener
)
Accept
()
(
net
.
Conn
,
error
)
{
func
(
self
*
Stopp
ableTCPListener
)
Accept
()
(
net
.
Conn
,
error
)
{
for
{
self
.
SetDeadline
(
time
.
Now
()
.
Add
(
time
.
Duration
(
500
*
time
.
Millis
econd
)))
self
.
SetDeadline
(
time
.
Now
()
.
Add
(
time
.
Duration
(
1
*
time
.
S
econd
)))
c
,
err
:=
self
.
TCPListener
.
AcceptTCP
()
select
{
case
<-
self
.
stop
:
case
<-*
self
.
stop
:
c
.
Close
()
self
.
TCPListener
.
Close
()
return
nil
,
listenerStoppedError
default
:
// keep on going
default
:
}
if
err
!=
nil
{
...
...
@@ -307,20 +335,21 @@ func (self *ControllableTCPListener) Accept() (net.Conn, error) {
}
}
return
c
,
err
return
&
ClosableConnection
{
c
,
self
.
stop
}
,
err
}
}
func
NewControllableTCPListener
(
addr
string
)
(
*
ControllableTCPListener
,
error
)
{
wl
,
err
:=
net
.
Listen
(
"tcp"
,
addr
)
if
err
!=
nil
{
return
nil
,
err
}
type
ClosableConnection
struct
{
*
net
.
TCPConn
closed
*
chan
struct
{}
}
if
tcpl
,
ok
:=
wl
.
(
*
net
.
TCPListener
);
ok
{
l
:=
&
ControllableTCPListener
{
tcpl
,
make
(
chan
struct
{})}
return
l
,
nil
func
(
self
*
ClosableConnection
)
Read
(
b
[]
byte
)
(
n
int
,
err
error
)
{
select
{
case
<-*
self
.
closed
:
self
.
TCPConn
.
Close
()
return
0
,
io
.
EOF
default
:
return
self
.
TCPConn
.
Read
(
b
)
}
return
nil
,
errors
.
New
(
"Unable to create TCP listener for RPC"
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录