From 4c5dbd3f67e975207fe2461a1c28ca54de0d43d5 Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 12 Sep 2012 18:19:51 +0200 Subject: [PATCH] Adding generic return to commands --- cmd/cgr-console/cgr-console.go | 9 ++++----- console/command.go | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/cgr-console/cgr-console.go b/cmd/cgr-console/cgr-console.go index 64d919255..aaef47e5e 100644 --- a/cmd/cgr-console/cgr-console.go +++ b/cmd/cgr-console/cgr-console.go @@ -25,7 +25,7 @@ import ( "net/rpc" "net/rpc/jsonrpc" "os" - //"reflect" + "reflect" "timespans" "console" ) @@ -60,12 +60,11 @@ func main() { if cmdErr != nil { log.Fatal( cmdErr ) } - //res := reflect.ValueOf(cmd.RpcResult()).Elem() - var res string - if rpcErr := client.Call(cmd.RpcMethod(), cmd.RpcParams(), &res); rpcErr != nil { + res := cmd.RpcResult() + if rpcErr := client.Call(cmd.RpcMethod(), cmd.RpcParams(), res); rpcErr != nil { log.Fatal( err ) } - fmt.Println( res ) + fmt.Println( reflect.ValueOf(res).Elem().String() ) } diff --git a/console/command.go b/console/command.go index 07afb3251..0ee5a6ddf 100644 --- a/console/command.go +++ b/console/command.go @@ -8,7 +8,6 @@ import ( ) - // Console Command interface type Commander interface { FromArgs(args []string) error // Load data from os arguments or flag.Args() @@ -57,4 +56,5 @@ func GetCommandValue( args []string ) ( Commander, error ) { } return cmdVal, nil } - + +