Merge pull request #1245 from bas-vk/ipcdatadirfix

ipc socket always uses default path
pull/1261/head
Jeffrey Wilcke 10 years ago
commit 4bb9a61049
  1. 2
      cmd/geth/main.go
  2. 2
      cmd/utils/flags.go

@ -308,7 +308,7 @@ func console(ctx *cli.Context) {
ethereum, ethereum,
ctx.String(utils.JSpathFlag.Name), ctx.String(utils.JSpathFlag.Name),
ctx.GlobalString(utils.RPCCORSDomainFlag.Name), ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
ctx.GlobalString(utils.IPCPathFlag.Name), filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "geth.ipc"),
true, true,
nil, nil,
) )

@ -387,7 +387,7 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error { func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error {
config := comms.IpcConfig{ config := comms.IpcConfig{
Endpoint: ctx.GlobalString(IPCPathFlag.Name), Endpoint: filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc"),
} }
xeth := xeth.New(eth, nil) xeth := xeth.New(eth, nil)

Loading…
Cancel
Save