mirror of https://github.com/poanetwork/quorum.git
ipcpath issue fix
This commit is contained in:
parent
c2590af7fd
commit
89525fcb4e
|
@ -438,17 +438,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
|
||||
|
|
Loading…
Reference in New Issue