diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-02-05 17:33:24 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-02-05 17:33:24 +0800 |
| commit | ba7c125153ce1be30985784a18edf38645406d03 (patch) | |
| tree | 92c1e2b8ec6ef0d4b39381148b3497e311e80b95 /cmd/geth | |
| parent | 212828963172b3921827df15abdc8602480e947d (diff) | |
| parent | 188ab928c3f2a2eac5ee0f7ac42cbf2f35568bcd (diff) | |
| download | go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.tar go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.tar.gz go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.tar.bz2 go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.tar.lz go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.tar.xz go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.tar.zst go-tangerine-ba7c125153ce1be30985784a18edf38645406d03.zip | |
Merge pull request #2168 from karalabe/move-rpc-into-node
cmd, common, node, rpc: move IPC into the node itself
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 7 | ||||
| -rw-r--r-- | cmd/geth/monitorcmd.go | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 09c7eee05..fa456a7ac 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -502,12 +502,7 @@ func startNode(ctx *cli.Context, stack *node.Node) { unlockAccount(ctx, accman, trimmed, i, passwords) } } - // Start auxiliary services if enabled. - if !ctx.GlobalBool(utils.IPCDisabledFlag.Name) { - if err := utils.StartIPC(stack, ctx); err != nil { - utils.Fatalf("Failed to start IPC: %v", err) - } - } + // Start auxiliary services if enabled if ctx.GlobalBool(utils.RPCEnabledFlag.Name) { if err := utils.StartRPC(stack, ctx); err != nil { utils.Fatalf("Failed to start RPC: %v", err) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index 1d7bf3f6a..4d56f2289 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -28,7 +28,7 @@ import ( "github.com/codegangsta/cli" "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/rpc" "github.com/gizak/termui" ) @@ -36,7 +36,7 @@ import ( var ( monitorCommandAttachFlag = cli.StringFlag{ Name: "attach", - Value: "ipc:" + common.DefaultIpcPath(), + Value: "ipc:" + node.DefaultIpcEndpoint(), Usage: "API endpoint to attach to", } monitorCommandRowsFlag = cli.IntFlag{ |