LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Perform display handler check before issues RPC.

Browse source 
This commit modifies the command handler in btcctl to check the existence
of a display handler before issues an RPC command.  This prevents a round
trip to the server if there is no display handler.

Also, fix a couple of comments while here.
This commit is contained in:
Dave Collins 2013-10-22 00:38:51 -05:00
parent 4e5cd1a326
commit 629168b7ae
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
util/btcctl/btcctl.go
View file

@ -59,8 +59,8 @@ var commandHandlers = map[string]*handlerData{
"stop": &handlerData{0, 0, displayGeneric, nil},
}
// toInt attempt to convert the passed string to an integer. It returns the
// integer packed into interface so it can be used in the calls which expect
// toInt attempts to convert the passed string to an integer. It returns the
// integer packed into an interface so it can be used in the calls which expect
// interfaces. An error will be returned if the string can't be converted to an
// integer.
func toInt(val string) (interface{}, error) {
@ -146,6 +146,11 @@ func commandHandler(cfg *config, command string, data *handlerData, args []strin
return ErrUsage
}
// Ensure there is a display handler.
if data.displayHandler == nil {
return ErrNoDisplayHandler
}
// Ensure the number of conversion handlers is valid if any are
// specified.
convHandlers := data.conversionHandlers
@ -177,11 +182,8 @@ func commandHandler(cfg *config, command string, data *handlerData, args []strin
return err
}
// Ensure there is a valid display handler and use it to display the
// results of the JSON-RPC command.
if data.displayHandler == nil {
return ErrNoDisplayHandler
}
// Display the results of the JSON-RPC command using the provided
// display handler.
err = data.displayHandler(reply)
if err != nil {
return err