Add Datacenter to output

This commit is contained in:
Armon Dadgar 2013-12-24 12:22:50 -08:00
parent 37aa0ae7a5
commit 3c7a06bb80
2 changed files with 11 additions and 9 deletions

View File

@ -165,11 +165,12 @@ func (c *Command) Run(args []string) int {
} }
c.Ui.Output("Consul agent running!") c.Ui.Output("Consul agent running!")
c.Ui.Info(fmt.Sprintf("Node name: '%s'", config.NodeName)) c.Ui.Info(fmt.Sprintf(" Node name: '%s'", config.NodeName))
c.Ui.Info(fmt.Sprintf(" RPC addr: '%s'", config.RPCAddr)) c.Ui.Info(fmt.Sprintf("Datacenter: '%s'", config.Datacenter))
c.Ui.Info(fmt.Sprintf("HTTP addr: '%s'", config.HTTPAddr)) c.Ui.Info(fmt.Sprintf(" RPC addr: '%s'", config.RPCAddr))
c.Ui.Info(fmt.Sprintf("Encrypted: %#v", config.EncryptKey != "")) c.Ui.Info(fmt.Sprintf(" HTTP addr: '%s'", config.HTTPAddr))
c.Ui.Info(fmt.Sprintf(" Server: %v", config.Server)) c.Ui.Info(fmt.Sprintf(" Encrypted: %#v", config.EncryptKey != ""))
c.Ui.Info(fmt.Sprintf(" Server: %v", config.Server))
// Enable log streaming // Enable log streaming
c.Ui.Info("") c.Ui.Info("")

View File

@ -74,10 +74,11 @@ type Config struct {
// DefaultConfig is used to return a sane default configuration // DefaultConfig is used to return a sane default configuration
func DefaultConfig() *Config { func DefaultConfig() *Config {
return &Config{ return &Config{
HTTPAddr: "127.0.0.1:8500", Datacenter: consul.DefaultDC,
LogLevel: "INFO", HTTPAddr: "127.0.0.1:8500",
RPCAddr: "127.0.0.1:8400", LogLevel: "INFO",
Server: false, RPCAddr: "127.0.0.1:8400",
Server: false,
} }
} }