Skip to content

Commit

Permalink
[FAB-5141] configtxgen --version should not panic
Browse files Browse the repository at this point in the history
If configtxgen cannot find a configtx.yaml file,
it panics.  While this in and of itself is ok,
it should not panic when simply trying to get the
version.

Two changes were made:

- move response to --version above all other flags
- added a defer / recover function to better handle
config not found and make things more clear

Change-Id: I512d1fed464c734db7178eb576440c45767f6994
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
  • Loading branch information
mastersingh24 committed Jul 1, 2017
1 parent ace2a64 commit d4adf7a
Showing 1 changed file with 19 additions and 5 deletions.
24 changes: 19 additions & 5 deletions common/configtx/tool/configtxgen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"fmt"
"io/ioutil"
"os"
"strings"

"github.com/hyperledger/fabric/bccsp/factory"
"github.com/hyperledger/fabric/common/config"
Expand Down Expand Up @@ -347,17 +348,30 @@ func main() {

flag.Parse()

// show version
if *version {
printVersion()
os.Exit(exitCode)
}

logging.SetLevel(logging.INFO, "")

// don't need to panic when running via command line
defer func() {
if err := recover(); err != nil {
if strings.Contains(fmt.Sprint(err), "Error reading configuration: Unsupported Config Type") {
logger.Error("Could not find configtx.yaml. " +
"Please make sure that FABRIC_CFG_PATH is set to a path " +
"which contains configtx.yaml")
}
os.Exit(1)
}
}()

logger.Info("Loading configuration")
factory.InitFactories(nil)
config := genesisconfig.Load(profile)

if *version {
printVersion()
os.Exit(exitCode)
}

if outputBlock != "" {
if err := doOutputBlock(config, channelID, outputBlock); err != nil {
logger.Fatalf("Error on outputBlock: %s", err)
Expand Down

0 comments on commit d4adf7a

Please sign in to comment.