diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-30 00:42:55 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-30 00:42:55 +0800 |
| commit | fc46cf337af614f4f9c96acd222089652fe7c76e (patch) | |
| tree | 672ce52e11b768801f0b33f224424ba5f0fdc465 /cmd | |
| parent | fd27f074feecec2f1e4c8041ff04ddac8d0ab6a3 (diff) | |
| parent | fbdb44dcc17240a01b45e55d3aa4e4b8db0868cd (diff) | |
| download | go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.tar go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.tar.gz go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.tar.bz2 go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.tar.lz go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.tar.xz go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.tar.zst go-tangerine-fc46cf337af614f4f9c96acd222089652fe7c76e.zip | |
Merge pull request #1946 from fjl/xeth-oom
Fix for xeth OOM issue
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/utils/flags.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index c2b92be46..299ab4abb 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -627,17 +627,14 @@ func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error { Endpoint: IpcSocketPath(ctx), } - initializer := func(conn net.Conn) (shared.EthereumApi, error) { + initializer := func(conn net.Conn) (comms.Stopper, shared.EthereumApi, error) { fe := useragent.NewRemoteFrontend(conn, eth.AccountManager()) xeth := xeth.New(eth, fe) - codec := codec.JSON - - apis, err := api.ParseApiString(ctx.GlobalString(IPCApiFlag.Name), codec, xeth, eth) + apis, err := api.ParseApiString(ctx.GlobalString(IPCApiFlag.Name), codec.JSON, xeth, eth) if err != nil { - return nil, err + return nil, nil, err } - - return api.Merge(apis...), nil + return xeth, api.Merge(apis...), nil } return comms.StartIpc(config, codec.JSON, initializer) |