good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
aaac1f0c
Commit
aaac1f0c
authored
Jun 12, 2015
by
Jeffrey Wilcke
Browse files
Options
Downloads
Plain Diff
Merge pull request #1254 from bas-vk/ipcwindowspathfix
Invalid named pipe name
parents
4bb9a610
55a796b7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
cmd/console/main.go
+1
-2
1 addition, 2 deletions
cmd/console/main.go
cmd/geth/main.go
+2
-2
2 additions, 2 deletions
cmd/geth/main.go
cmd/utils/flags.go
+20
-1
20 additions, 1 deletion
cmd/utils/flags.go
common/path.go
+3
-0
3 additions, 0 deletions
common/path.go
with
26 additions
and
5 deletions
cmd/console/main.go
+
1
−
2
View file @
aaac1f0c
...
...
@@ -52,7 +52,6 @@ func init() {
app
.
Action
=
run
app
.
Flags
=
[]
cli
.
Flag
{
utils
.
IPCDisabledFlag
,
utils
.
IPCPathFlag
,
utils
.
VerbosityFlag
,
utils
.
JSpathFlag
,
...
...
@@ -93,7 +92,7 @@ func main() {
func
run
(
ctx
*
cli
.
Context
)
{
jspath
:=
ctx
.
GlobalString
(
utils
.
JSpathFlag
.
Name
)
ipcpath
:=
ctx
.
GlobalString
(
utils
.
IPCPathFlag
.
Name
)
ipcpath
:=
utils
.
IpcSocketPath
(
ctx
)
repl
:=
newJSRE
(
jspath
,
ipcpath
)
repl
.
welcome
(
ipcpath
)
...
...
This diff is collapsed.
Click to expand it.
cmd/geth/main.go
+
2
−
2
View file @
aaac1f0c
...
...
@@ -308,7 +308,7 @@ func console(ctx *cli.Context) {
ethereum
,
ctx
.
String
(
utils
.
JSpathFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
RPCCORSDomainFlag
.
Name
),
filepath
.
Join
(
ctx
.
GlobalString
(
utils
.
DataDirFlag
.
Name
),
"geth.ipc"
),
utils
.
IpcSocketPath
(
ctx
),
true
,
nil
,
)
...
...
@@ -330,7 +330,7 @@ func execJSFiles(ctx *cli.Context) {
ethereum
,
ctx
.
String
(
utils
.
JSpathFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
RPCCORSDomainFlag
.
Name
),
ctx
.
GlobalString
(
utils
.
IPCPathFlag
.
Name
),
utils
.
IpcSocketPath
(
ctx
),
false
,
nil
,
)
...
...
This diff is collapsed.
Click to expand it.
cmd/utils/flags.go
+
20
−
1
View file @
aaac1f0c
...
...
@@ -385,9 +385,28 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
return
accounts
.
NewManager
(
ks
)
}
func
IpcSocketPath
(
ctx
*
cli
.
Context
)
(
ipcpath
string
)
{
if
common
.
IsWindows
()
{
ipcpath
=
common
.
DefaultIpcPath
()
if
ipcpath
!=
ctx
.
GlobalString
(
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
()
{
ipcpath
=
filepath
.
Join
(
ctx
.
GlobalString
(
DataDirFlag
.
Name
),
"geth.ipc"
)
}
}
return
}
func
StartIPC
(
eth
*
eth
.
Ethereum
,
ctx
*
cli
.
Context
)
error
{
config
:=
comms
.
IpcConfig
{
Endpoint
:
filepath
.
Join
(
ctx
.
GlobalString
(
DataDirFlag
.
Name
),
"geth.ipc"
),
Endpoint
:
IpcSocketPath
(
ctx
),
}
xeth
:=
xeth
.
New
(
eth
,
nil
)
...
...
This diff is collapsed.
Click to expand it.
common/path.go
+
3
−
0
View file @
aaac1f0c
...
...
@@ -95,6 +95,9 @@ func DefaultDataDir() string {
}
func
DefaultIpcPath
()
string
{
if
runtime
.
GOOS
==
"windows"
{
return
`\\.\pipe\geth.ipc`
}
return
filepath
.
Join
(
DefaultDataDir
(),
"geth.ipc"
)
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment