diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-03 23:26:57 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-03 23:26:57 +0800 |
| commit | 4dfcd6012b17032ca3bb06afb76b9b283578b82a (patch) | |
| tree | 9324e07fd8a8a978182be5af466e432d6d19631d /cmd/utils | |
| parent | 546c0f631c77be253d1293b82cf3843d752a2ae2 (diff) | |
| parent | e8c1399bbf08234389f0e8f5da08f146856dab12 (diff) | |
| download | dexon-4dfcd6012b17032ca3bb06afb76b9b283578b82a.tar.gz dexon-4dfcd6012b17032ca3bb06afb76b9b283578b82a.tar.zst dexon-4dfcd6012b17032ca3bb06afb76b9b283578b82a.zip | |
Merge pull request #1392 from bas-vk/ipcpipelining
Several bugfixes to IPC channel
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f27f1bbcd..b4182ff59 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -432,17 +432,17 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager { func IpcSocketPath(ctx *cli.Context) (ipcpath string) { if common.IsWindows() { ipcpath = common.DefaultIpcPath() - if ipcpath != ctx.GlobalString(IPCPathFlag.Name) { + if ctx.GlobalIsSet(IPCPathFlag.Name) { ipcpath = ctx.GlobalString(IPCPathFlag.Name) } } else { ipcpath = common.DefaultIpcPath() - if ctx.GlobalString(IPCPathFlag.Name) != common.DefaultIpcPath() { - ipcpath = ctx.GlobalString(IPCPathFlag.Name) - } else if ctx.GlobalString(DataDirFlag.Name) != "" && - ctx.GlobalString(DataDirFlag.Name) != common.DefaultDataDir() { + if ctx.GlobalIsSet(DataDirFlag.Name) { ipcpath = filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc") } + if ctx.GlobalIsSet(IPCPathFlag.Name) { + ipcpath = ctx.GlobalString(IPCPathFlag.Name) + } } return |