diff options
| author | Felix Lange <fjl@twurst.com> | 2016-09-29 20:24:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 20:24:37 +0800 |
| commit | 44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308 (patch) | |
| tree | aaab07e78f7b9341f0fcfbd9348fe96273bd6a0d /cmd/geth/consolecmd.go | |
| parent | 4e8cec05abb567457e80185cb9fcf7ec2cc90596 (diff) | |
| parent | b42a5b118f1aa7ac1235547c8594146978941401 (diff) | |
| download | dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.gz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.bz2 dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.lz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.xz dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.tar.zst dexon-44bc2e80ddf82ea2a37c25e7beb0ca06b46b7308.zip | |
Merge pull request #2914 from fjl/node-coinhabit
cmd/utils, node: make datadir reusable for bzzd
Diffstat (limited to 'cmd/geth/consolecmd.go')
| -rw-r--r-- | cmd/geth/consolecmd.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 92d6f7f86..066247303 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -107,7 +107,7 @@ func remoteConsole(ctx *cli.Context) error { utils.Fatalf("Unable to attach to remote geth: %v", err) } config := console.Config{ - DataDir: utils.MustMakeDataDir(ctx), + DataDir: utils.MakeDataDir(ctx), DocRoot: ctx.GlobalString(utils.JSpathFlag.Name), Client: client, Preload: utils.MakeConsolePreloads(ctx), @@ -135,7 +135,7 @@ func remoteConsole(ctx *cli.Context) error { // for "geth attach" and "geth monitor" with no argument. func dialRPC(endpoint string) (*rpc.Client, error) { if endpoint == "" { - endpoint = node.DefaultIPCEndpoint() + endpoint = node.DefaultIPCEndpoint(clientIdentifier) } else if strings.HasPrefix(endpoint, "rpc:") || strings.HasPrefix(endpoint, "ipc:") { // Backwards compatibility with geth < 1.5 which required // these prefixes. |