aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-06-12 03:01:07 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-06-12 03:01:07 +0800
commit4bb9a61049882f427e2742773c69b969849da1c2 (patch)
treea243246b02d85a2ffd60f66347e83bd536038fe9
parente2c2d8e15ebef85c77f7486f92c6430ca6f30785 (diff)
parent22080e1fdd8eafd6201bb5a06ac19859bcc6b432 (diff)
downloadgo-tangerine-4bb9a61049882f427e2742773c69b969849da1c2.tar.gz
go-tangerine-4bb9a61049882f427e2742773c69b969849da1c2.tar.zst
go-tangerine-4bb9a61049882f427e2742773c69b969849da1c2.zip
Merge pull request #1245 from bas-vk/ipcdatadirfix
ipc socket always uses default path
-rw-r--r--cmd/geth/main.go2
-rw-r--r--cmd/utils/flags.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8e55b310c..11ea23165 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -308,7 +308,7 @@ func console(ctx *cli.Context) {
ethereum,
ctx.String(utils.JSpathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- ctx.GlobalString(utils.IPCPathFlag.Name),
+ filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "geth.ipc"),
true,
nil,
)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 4c3690d49..80f21d50a 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -387,7 +387,7 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error {
config := comms.IpcConfig{
- Endpoint: ctx.GlobalString(IPCPathFlag.Name),
+ Endpoint: filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc"),
}
xeth := xeth.New(eth, nil)