diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-28 21:52:09 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-28 21:52:09 +0800 |
| commit | b46e1ca97e61ebfe4c37961e723142245efe5016 (patch) | |
| tree | 45838760ad08592995cd1051c29c6d41d08cd24c /eth | |
| parent | 159c4d56cd82d6fe721058557977f4efda31661c (diff) | |
| parent | e9d017ba082bfd624267c974fa93a77da6269756 (diff) | |
| download | go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.gz go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.zst go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.zip | |
Merge branch 'jsonrpc' of github.com-obscure:ethereum/go-ethereum into jsonrpc
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index c3c7d1287..ab30a1b38 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -66,7 +66,8 @@ type Ethereum struct { txSub event.Subscription blockSub event.Subscription - RpcServer *rpc.JsonRpcServer + RpcServer rpc.RpcServer + WsServer rpc.RpcServer keyManager *crypto.KeyManager clientIdentity p2p.ClientIdentity @@ -276,6 +277,9 @@ func (s *Ethereum) Stop() { if s.RpcServer != nil { s.RpcServer.Stop() } + if s.WsServer != nil { + s.WsServer.Stop() + } s.txPool.Stop() s.eventMux.Stop() s.blockPool.Stop() |