Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
cda68a19
Commit
cda68a19
authored
Nov 10, 2014
by
Brian Tiger Chow
Committed by
Juan Batiz-Benet
Nov 14, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(ipfs2/main) return err
parent
13a90537
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
14 deletions
+12
-14
cmd/ipfs2/main.go
cmd/ipfs2/main.go
+12
-14
No files found.
cmd/ipfs2/main.go
View file @
cda68a19
...
...
@@ -76,7 +76,10 @@ func run() error {
return
nil
}
res
:=
callCommand
(
req
,
root
)
res
,
err
:=
callCommand
(
req
,
root
)
if
err
!=
nil
{
return
err
}
outputResponse
(
res
,
root
)
return
nil
...
...
@@ -157,45 +160,40 @@ func handleHelpOption(req cmds.Request, root *cmds.Command) (helpTextDisplayed b
return
false
,
nil
}
func
callCommand
(
req
cmds
.
Request
,
root
*
cmds
.
Command
)
cmds
.
Response
{
func
callCommand
(
req
cmds
.
Request
,
root
*
cmds
.
Command
)
(
cmds
.
Response
,
error
)
{
var
res
cmds
.
Response
if
root
==
Root
{
if
root
==
Root
{
// TODO explain what it means when root == Root
res
=
root
.
Call
(
req
)
}
else
{
local
,
err
:=
req
.
Option
(
"local"
)
.
Bool
()
if
err
!=
nil
{
fmt
.
Println
(
err
)
exit
(
1
)
return
nil
,
err
}
if
(
!
req
.
Option
(
"local"
)
.
Found
()
||
!
local
)
&&
daemon
.
Locked
(
req
.
Context
()
.
ConfigRoot
)
{
addr
,
err
:=
ma
.
NewMultiaddr
(
req
.
Context
()
.
Config
.
Addresses
.
API
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
exit
(
1
)
return
nil
,
err
}
_
,
host
,
err
:=
manet
.
DialArgs
(
addr
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
exit
(
1
)
return
nil
,
err
}
client
:=
cmdsHttp
.
NewClient
(
host
)
res
,
err
=
client
.
Send
(
req
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
exit
(
1
)
return
nil
,
err
}
}
else
{
node
,
err
:=
core
.
NewIpfsNode
(
req
.
Context
()
.
Config
,
false
)
if
err
!=
nil
{
fmt
.
Println
(
err
)
exit
(
1
)
return
nil
,
err
}
defer
node
.
Close
()
req
.
Context
()
.
Node
=
node
...
...
@@ -204,7 +202,7 @@ func callCommand(req cmds.Request, root *cmds.Command) cmds.Response {
}
}
return
res
return
res
,
nil
}
func
outputResponse
(
res
cmds
.
Response
,
root
*
cmds
.
Command
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment