kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 18:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Display bind/advertise addresses on agent startup

Browse Source 
Sample outputs from demo/vagrant/(server/client1).hcl and `nomad agent -dev` mode

Server:

```
==> Nomad agent configuration:

       Advertise Addrs: HTTP: 192.168.1.75:4646; RPC: 192.168.1.75:4647; Serf: 192.168.1.75:4648
            Bind Addrs: HTTP: 0.0.0.0:4646; RPC: 0.0.0.0:4647; Serf: 0.0.0.0:4648
                Client: false
             Log Level: DEBUG
                Region: global (DC: dc1)
                Server: true
               Version: 0.8.4-dev
```

Client:

```
==> Nomad agent configuration:

       Advertise Addrs: HTTP: 192.168.1.75:5656
            Bind Addrs: HTTP: 0.0.0.0:5656
                Client: true
             Log Level: DEBUG
                Region: global (DC: dc1)
                Server: false
               Version: 0.8.4-dev
```

Dev:

```
==> Nomad agent configuration:

       Advertise Addrs: HTTP: 127.0.0.1:4646; RPC: 127.0.0.1:4647; Serf: 127.0.0.1:4648
            Bind Addrs: HTTP: 127.0.0.1:4646; RPC: 127.0.0.1:4647; Serf: 127.0.0.1:4648
                Client: true
             Log Level: DEBUG
                Region: global (DC: dc1)
                Server: true
               Version: 0.8.4-dev
```
This commit is contained in:
Alex Dadgar
2018-05-22 15:14:01 -07:00
parent e108f732b6
commit df70a934b2
1 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
command/agent/command.go
View File

@@ -518,6 +518,8 @@ func (c *Command) Run(args []string) int {
info["log level"] = config.LogLevel
info["server"] = strconv.FormatBool(config.Server.Enabled)
info["region"] = fmt.Sprintf("%s (DC: %s)", config.Region, config.Datacenter)
info["bind addrs"] = c.getBindAddrSynopsis()
info["advertise addrs"] = c.getAdvertiseAddrSynopsis()
// Sort the keys for output
infoKeys := make([]string, 0, len(info))
@@ -843,6 +845,50 @@ func (c *Command) startupJoin(config *Config) error {
return nil
}
// getBindAddrSynopsis returns a string that describes the addresses the agent
// is bound to.
func (c *Command) getBindAddrSynopsis() string {
if c == nil || c.agent == nil || c.agent.config == nil || c.agent.config.normalizedAddrs == nil {
return ""
}
b := new(strings.Builder)
fmt.Fprintf(b, "HTTP: %s", c.agent.config.normalizedAddrs.HTTP)
if c.agent.server != nil {
if c.agent.config.normalizedAddrs.RPC != "" {
fmt.Fprintf(b, "; RPC: %s", c.agent.config.normalizedAddrs.RPC)
}
if c.agent.config.normalizedAddrs.Serf != "" {
fmt.Fprintf(b, "; Serf: %s", c.agent.config.normalizedAddrs.Serf)
}
}
return b.String()
}
// getAdvertiseAddrSynopsis returns a string that describes the addresses the agent
// is advertising.
func (c *Command) getAdvertiseAddrSynopsis() string {
if c == nil || c.agent == nil || c.agent.config == nil || c.agent.config.AdvertiseAddrs == nil {
return ""
}
b := new(strings.Builder)
fmt.Fprintf(b, "HTTP: %s", c.agent.config.AdvertiseAddrs.HTTP)
if c.agent.server != nil {
if c.agent.config.AdvertiseAddrs.RPC != "" {
fmt.Fprintf(b, "; RPC: %s", c.agent.config.AdvertiseAddrs.RPC)
}
if c.agent.config.AdvertiseAddrs.Serf != "" {
fmt.Fprintf(b, "; Serf: %s", c.agent.config.AdvertiseAddrs.Serf)
}
}
return b.String()
}
func (c *Command) Synopsis() string {
return "Runs a Nomad agent"
}