LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

clean up some logging

Browse Source
This commit is contained in:
Ethan Buchman 2017-03-18 20:48:48 -04:00
parent 43beb174d6
commit 9fc2668c37
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/commands/start.go
View File

@ -76,8 +76,6 @@ func cmdStart(c *cli.Context) error {
basecoinApp.RegisterPlugin(p.newPlugin())
}
fmt.Println("CHAIN ID", basecoinApp.GetState().GetChainID())
// if chain_id has not been set yet, load the genesis.
// else, assume it's been loaded
if basecoinApp.GetState().GetChainID() == "" {
@ -93,16 +91,15 @@ func cmdStart(c *cli.Context) error {
}
}
fmt.Println("CHAIN ID", basecoinApp.GetState().GetChainID())
chainID := basecoinApp.GetState().GetChainID()
if c.Bool("without-tendermint") {
log.Notice("Starting Basecoin without Tendermint", "chain_id", chainID)
// run just the abci app/server
if err := startBasecoinABCI(c, basecoinApp); err != nil {
return err
}
return startBasecoinABCI(c, basecoinApp)
} else {
log.Notice("Starting Basecoin with Tendermint", "chain_id", chainID)
// start the app with tendermint in-process
startTendermint(basecoinDir, basecoinApp)
return startTendermint(basecoinDir, basecoinApp)
}
return nil
@ -123,7 +120,7 @@ func startBasecoinABCI(c *cli.Context, basecoinApp *app.Basecoin) error {
}
func startTendermint(dir string, basecoinApp *app.Basecoin) {
func startTendermint(dir string, basecoinApp *app.Basecoin) error {
// Get configuration
tmConfig := tmcfg.GetConfig(dir)
@ -136,11 +133,16 @@ func startTendermint(dir string, basecoinApp *app.Basecoin) {
privValidator := tmtypes.LoadOrGenPrivValidator(privValidatorFile)
n := node.NewNode(tmConfig, privValidator, proxy.NewLocalClientCreator(basecoinApp))
n.Start()
_, err := n.Start()
if err != nil {
return err
}
// Wait forever
cmn.TrapSignal(func() {
// Cleanup
n.Stop()
})
return nil
}