Merge pull request #1764 from kobigurk/honor_ipc_datadir

karalabe · karalabe · commit ebbe25ee71de · 2015-09-03T10:48:23.000+03:00
honors datadir when attaching
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -402,7 +402,7 @@ func attach(ctx *cli.Context) {
 		client, err = comms.ClientFromEndpoint(ctx.Args().First(), codec.JSON)
 	} else {
 		cfg := comms.IpcConfig{
-			Endpoint: ctx.GlobalString(utils.IPCPathFlag.Name),
+			Endpoint: utils.IpcSocketPath(ctx),
 		}
 		client, err = comms.NewIpcClient(cfg, codec.JSON)
 	}

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ func attach(ctx *cli.Context) {`
`402`	`402`	`client, err = comms.ClientFromEndpoint(ctx.Args().First(), codec.JSON)`
`403`	`403`	`} else {`
`404`	`404`	`cfg := comms.IpcConfig{`
`405`		`- Endpoint: ctx.GlobalString(utils.IPCPathFlag.Name),`
	`405`	`+ Endpoint: utils.IpcSocketPath(ctx),`
`406`	`406`	`}`
`407`	`407`	`client, err = comms.NewIpcClient(cfg, codec.JSON)`
`408`	`408`	`}`