Merge pull request #1245 from bas-vk/ipcdatadirfix

ipc socket always uses default path
This commit is contained in:
Jeffrey Wilcke 2015-06-11 12:01:07 -07:00
commit 4bb9a61049
2 changed files with 2 additions and 2 deletions

View File

@ -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,
) )

View File

@ -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)