aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Meister <mmeister@suse.de>2017-11-28 21:00:00 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-11-28 21:00:00 +0800
commit8f35e3086cbea24839c5435b1cebe85a438b42d3 (patch)
treebdb74bdc26e497aa93fa8d8bd0e1e11872f329b3
parente323ed5a9a82a2ea603d921492e5109a5ce4e7d2 (diff)
downloadgo-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.tar
go-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.tar.gz
go-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.tar.bz2
go-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.tar.lz
go-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.tar.xz
go-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.tar.zst
go-tangerine-8f35e3086cbea24839c5435b1cebe85a438b42d3.zip
cmd/geth: fix geth attach --datadir=... (#15517)
-rw-r--r--cmd/geth/consolecmd.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
index 2bb452d73..051962be4 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/geth/consolecmd.go
@@ -17,6 +17,7 @@
package main
import (
+ "fmt"
"os"
"os/signal"
"strings"
@@ -112,7 +113,11 @@ func localConsole(ctx *cli.Context) error {
// console to it.
func remoteConsole(ctx *cli.Context) error {
// Attach to a remotely running geth instance and start the JavaScript console
- client, err := dialRPC(ctx.Args().First())
+ endpoint := ctx.Args().First()
+ if endpoint == "" && ctx.GlobalIsSet(utils.DataDirFlag.Name) {
+ endpoint = fmt.Sprintf("%s/geth.ipc", ctx.GlobalString(utils.DataDirFlag.Name))
+ }
+ client, err := dialRPC(endpoint)
if err != nil {
utils.Fatalf("Unable to attach to remote geth: %v", err)
}